Fix segfault in h5dump caused by corrupted btree node level #5002
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added another argument, expected node level, to H5B__iterate_helper to pass down to H5B__cache_deserialize for checking the decoded node level. When this expected level is not known, the new macro H5_UNKNOWN_NODELEVEL (-1) will be used for not checking the level. Fixes HDFGroupGH-4432
bmribler
requested review from
lrknox,
derobins,
byrnHDF,
fortnern,
jhendersonHDF,
qkoziol,
vchoi-hdfgroup,
glennsong09,
mattjala and
brtnfld
as code owners
bmribler
changed the title
mattjala
approved these changes
Oct 24, 2024
derobins
reviewed
Oct 24, 2024
src/H5Bpkg.h
Outdated
| @@ -60,6 +60,7 @@ typedef struct H5B_t { | |||
| typedef struct H5B_cache_ud_t { | |||
| H5F_t *f; /* File that B-tree node is within */ | |||
| const struct H5B_class_t *type; /* Type of tree */ | |||
| unsigned exp_level; /* Expected level of the current node */ | |||
There was a problem hiding this comment.
I'd make this an int and not unsigned since -1 is a valid value.
derobins
added
Priority - 1. High 🔼
derobins
reviewed
Oct 25, 2024
src/H5Bprivate.h
Outdated
| /* Indicates that the level of the current node is unknown. When the level | ||
| * is known, it can be used to detect corrupted level during decoding | ||
| */ | ||
| #define H5B_UNKNOWN_NODELEVEL (unsigned)-1 |
There was a problem hiding this comment.
This should probably move to H5Bpkg.h
qkoziol
approved these changes
Oct 28, 2024
derobins
approved these changes
Oct 29, 2024
brtnfld
pushed a commit
to brtnfld/hdf5
that referenced
this pull request
Oct 31, 2024
…#5002) Added another argument, expected node level, to H5B__iterate_helper to pass down to H5B__cache_deserialize for checking the decoded node level. When this expected level is not known, the new macro H5_UNKNOWN_NODELEVEL (-1) will be used for not checking the level. Fixes HDFGroupGH-4432
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re-do of PR #4862
Added another argument, expected node level, to H5B__iterate_helper to pass down to H5B__cache_deserialize for checking the decoded node level. When this expected level is not known, the new macro H5B_UNKNOWN_NODELEVEL (-1) will be used for not checking the level.
Fixes GH-4432