common/hostlist: fix out of bounds array access #158
Merged
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
Problem: Internally within the hostlist data structure, an array of hostranges is kept. An out of bounds array access can occur if the number of hostranges is equal to the length of the array. Add check to ensure out of bound array access is not allowed when iterating hosts.
grondo
reviewed
Aug 23, 2024
Comment on lines
+2281
to
+2285
| if (i->idx >= (i->hl->size - 1)) { | ||
| ++i->idx; | ||
| i->hr = NULL; | ||
| return; | ||
| } |
There was a problem hiding this comment.
Was going to apply this fix to upstream hostlist, slightly modified for simplicity (avoid increment of i->idx in two places)
diff --git a/hostlist/hostlist.c b/hostlist/hostlist.c
index 4db24ba..6385cf9 100644
--- a/hostlist/hostlist.c
+++ b/hostlist/hostlist.c
@@ -2281,7 +2281,11 @@ static void _iterator_advance(hostlist_iterator_t i)
return;
if (++(i->depth) > (i->hr->hi - i->hr->lo)) {
i->depth = 0;
- i->hr = i->hl->hr[++i->idx];
+ if (++i->idx >= i->hl->size) {
+ i->hr = NULL;
+ return;
+ }
+ i->hr = i->hl->hr[i->idx];
}
}LMK if that looks ok
There was a problem hiding this comment.
Alternately, we can merge this PR for historical value, then I'll propose a PR to update hostlist.[ch] to the latest.
There was a problem hiding this comment.
That looks fine to me. Would you like to close this PR and submit your own PR to update hostlist? Then I can copy it down into powerman, genders, etc. etc.
grondo
added
the
merge-when-passing
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.
Problem: Internally within the hostlist data structure, an array of hostranges is kept. An out of bounds array access can occur if the number of hostranges is equal to the length of the array.
Add check to ensure out of bound array access is not allowed when iterating hosts.