subsys/net/net_mgmt.c: Fix memory corruption in wait_on_iface #62302
Conversation
This file contains hidden or 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
bjarki-andreasen
requested review from
jukkar,
rlubos and
tbursztyka
as code owners
rerickson1
previously approved these changes
Sep 5, 2023
jukkar
reviewed
Sep 5, 2023
bjarki-andreasen
force-pushed
the
bugfix_net_mgmt_wait_on_iface_memory_corruption
branch
from
81d63ed to
b07a835
Compare
Contributor
Author
|
Updated commit subject to the build test failing is not due to changes in this PR :) |
Member
The issue was fixed by #62317, could you rebase and re-submit. |
tbursztyka
previously approved these changes
Sep 6, 2023
subsys/net/ip/net_mgmt.c
Outdated
Contributor
There was a problem hiding this comment.
could you rewrite the above as such:
if (ret < 0) {
if (ret == -EAGAIN) {
ret = -ETIMEDOUT;
}
net_mgmt_del_event_callback(&sync);
return ret;
}
it's shorter/clearer I think.
Contributor
Author
There was a problem hiding this comment.
Rewritten as you have suggested :)
See last force-push
bjarki-andreasen
force-pushed
the
bugfix_net_mgmt_wait_on_iface_memory_corruption
branch
from
b07a835 to
f785192
Compare
The net_mgmt subsystem offers a function which waits (blocks) until a specified net event occurs. An event callback is pushed to the stack, then added to the net_mgmt_event_callback list. If the event occurs, the net_mgmt thread calls the callback and deletes the callback from the list. However, if the event does not occur within the timeout specified when invoking mgmt_event_wait_call() the function will return, corrupting the callback structure the stack is reused. This PR fixes the issue by deleting the callback before exiting in case the event does not occur. Signed-off-by: Bjarki Arge Andreasen <bjarkix123@gmail.com>
bjarki-andreasen
dismissed stale reviews from rerickson1 and tbursztyka
via
4c65cbf
bjarki-andreasen
force-pushed
the
bugfix_net_mgmt_wait_on_iface_memory_corruption
branch
from
f785192 to
4c65cbf
Compare
Contributor
Author
|
@jukkar Rebased on main |
rerickson1
approved these changes
Sep 6, 2023
jukkar
approved these changes
Sep 6, 2023
This was referenced Nov 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
The net_mgmt subsystem offers a function which waits (blocks) until a specified net event occurs. An event callback is pushed to the stack, then added to the net_mgmt_event_callback list. If the event occurs, the net_mgmt thread calls the callback and deletes the callback from the list. However, if the event does not occur within the timeout specified when invoking mgmt_event_wait_call() the function will return, corrupting the callback structure when the stack is reused.
This PR fixes the issue by deleting the callback before exiting in case the event does not occur.
@rerickson1 I found it! #56692 (comment)