Don't abort program if next_key is NULL in ebpf_map_get_next_key() #3900
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
lmb
requested review from
dthaler,
poornagmsft,
Alan-Jowett,
saxena-anurag,
shankarseal,
dv-msft,
gtrevi,
shpalani,
matthewige,
mtfriesen and
rectified95
as code owners
dthaler
reviewed
Oct 3, 2024
lmb
force-pushed
the
bpf-compat-next-key-assert
branch
2 times, most recently
from
70b4642
to
1bfaab6
Compare
dthaler
previously approved these changes
Oct 6, 2024
|
Fix libbpf_test failed test case. |
Alan-Jowett
previously approved these changes
Oct 7, 2024
tests/unit/libbpf_test.cpp
Outdated
| @@ -1005,6 +1005,11 @@ TEST_CASE("libbpf map", "[libbpf]") | |||
| REQUIRE(result < 0); | |||
| REQUIRE(errno == EINVAL); | |||
|
|
|||
| // next_key is NULL. | |||
| result = bpf_map_get_next_key(map_fd, NULL, &value); | |||
There was a problem hiding this comment.
question: the second argument to bpf_map_get_next_key() is previous_key, which is being passed as NULL here, whereas the comment says next_key is NULL. The above code change is also for handling next_key being NULL. Is this expected?
On Linux it is valid to pass NULL as next_key for queue type maps, since that map type doesn't really have a key. Return EINVAL instead of aborting the process via an assert.
lmb
force-pushed
the
bpf-compat-next-key-assert
branch
from
1bfaab6
to
ecf7ea9
Compare
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.
On Linux it is valid to pass NULL as next_key for queue type maps, since that map type doesn't really have a key. Return EINVAL instead of aborting the process via an assert.