[Backport v4.3-branch] Bluetooth: HCI: psoc6_bless: Make the TX packet info a local variable - #117349
Open
github-actions[bot] wants to merge 1 commit into
Open
[Backport v4.3-branch] Bluetooth: HCI: psoc6_bless: Make the TX packet info a local variable#117349github-actions[bot] wants to merge 1 commit into
github-actions[bot] wants to merge 1 commit into
Conversation
hci_tx_pkt is a file-scope variable, but psoc6_bless_send() clears and populates it before taking psoc6_bless_operation_sem, so two senders can overwrite each other's packet information, and the one holding the semaphore can end up handing the controller a packet that describes the other buffer. Nothing else uses the variable, and it does not need to outlive the call: Cy_BLE_SoftHciSendAppPkt() copies the packet into the controller's buffer before returning, as documented in cy_ble_stack.h. Make it a local variable, which removes the shared state instead of locking it. Assisted-by: Claude:claude-opus-5 Signed-off-by: Johan Hedberg <johan.hedberg@silabs.com> (cherry picked from commit 7d0efa3)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Backport 7d0efa3 from #116647.
Original PR description:
hci_tx_pkt is a file-scope variable, but psoc6_bless_send() clears and populates it before taking psoc6_bless_operation_sem, so two senders can overwrite each other's packet information, and the one holding the semaphore can end up handing the controller a packet that describes the other buffer.
Nothing else uses the variable, and it does not need to outlive the call: Cy_BLE_SoftHciSendAppPkt() copies the packet into the controller's buffer before returning, as documented in cy_ble_stack.h. Make it a local variable, which removes the shared state instead of locking it.
Compile tested only (no hardware): samples/bluetooth/peripheral_hr for cy8cproto_063_ble.
Fixes: #117347