Bluetooth: conn: check for disconnected earlier when sending #68748
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
Verify the connection is active before popping the buffer from the TX queue. The current behavior enables a race condition between `create_frag` and the connection being torn down, as `buf` can be popped from the TX queue but not destroyed by `bt_conn_process_tx`. In that case, `buf` will be leaked. Original analysis and fix proposal by @watsug. Signed-off-by: Jonathan Rico <[email protected]> Reported-by: Adam Augustyn<[email protected]>
It is unclear from a cursory glance at the code what the caller of `send_buf(buf)` should do with `buf` based on the returned error codes. Document when ownership is and isn't transferred to `send_buf()`. Signed-off-by: Jonathan Rico <[email protected]>
zephyrbot
added
area: Bluetooth Host
zephyrbot
requested review from
alwa-nordic,
hermabe,
jhedberg,
sjanc,
Thalley and
theob-pro
jhedberg
approved these changes
Feb 8, 2024
theob-pro
approved these changes
Feb 9, 2024
Thalley
reviewed
Feb 9, 2024
Comment on lines
+734
to
+736
| * - -EIO: buffer failed to send due to HCI error. `buf` ownership returned to | ||
| * caller BUT `buf` is popped from the TX queue. The caller shall destroy | ||
| * `buf` and its TX context. |
There was a problem hiding this comment.
If the caller shall destroy on this error, couldn't this function do that?
There was a problem hiding this comment.
ownership is a bit messy regarding those 3 functions.
I am currently rewriting the whole TX flow so I'd rather quick-fix this particular issue and reserve the in-depth review for the refactor if that's alright.
Thalley
approved these changes
Feb 9, 2024
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.
Verify the connection is active before popping the buffer from the TX
queue.
The current behavior enables a race condition between
create_fragandthe connection being torn down, as
bufcan be popped from the TX queuebut not destroyed by
bt_conn_process_tx.In that case,
bufwill be leaked.Original analysis and fix proposal by @watsug.