Bluetooth: Fix usage of __hci_cmd_sync_status
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/1 Bluetooth: Fix usage of __hci_cmd_sync_status
From: Luiz Augusto von Dentz <[email protected]>
__hci_cmd_sync_status shall only be used if hci_req_sync_lock is _not_ required which is not the case of hci_dev_cmd so it needs to use hci_cmd_sync_status which uses hci_req_sync_lock internally.
--- net/bluetooth/hci_core.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)
net/bluetooth/hci_core.c +12 -15
@@ -718,8 +718,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)switch (cmd) {case HCISETAUTH : - err =__hci_cmd_sync_status (hdev,HCI_OP_WRITE_AUTH_ENABLE , -1 , &dr.dev_opt,HCI_CMD_TIMEOUT ); + err =hci_cmd_sync_status (hdev,HCI_OP_WRITE_AUTH_ENABLE , +1 , &dr.dev_opt,HCI_CMD_TIMEOUT );break ;case HCISETENCRYPT :
@@ -730,23 +730,21 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)if (!test_bit (HCI_AUTH , &hdev->flags)) {/* Auth must be enabled first */ - err =__hci_cmd_sync_status (hdev, -HCI_OP_WRITE_AUTH_ENABLE , -1 , &dr.dev_opt, -HCI_CMD_TIMEOUT ); + err =hci_cmd_sync_status (hdev, +HCI_OP_WRITE_AUTH_ENABLE , +1 , &dr.dev_opt, +HCI_CMD_TIMEOUT );if (err)break ; } - err =__hci_cmd_sync_status (hdev,HCI_OP_WRITE_ENCRYPT_MODE , -1 , &dr.dev_opt, -HCI_CMD_TIMEOUT ); + err =hci_cmd_sync_status (hdev,HCI_OP_WRITE_ENCRYPT_MODE , +1 , &dr.dev_opt,HCI_CMD_TIMEOUT );break ;case HCISETSCAN : - err =__hci_cmd_sync_status (hdev,HCI_OP_WRITE_SCAN_ENABLE , -1 , &dr.dev_opt, -HCI_CMD_TIMEOUT ); + err =hci_cmd_sync_status (hdev,HCI_OP_WRITE_SCAN_ENABLE , +1 , &dr.dev_opt,HCI_CMD_TIMEOUT );/* Ensure that the connectable and discoverable states * get correctly modified as this was a non-mgmt change.
@@ -758,9 +756,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)case HCISETLINKPOL : policy =cpu_to_le16 (dr.dev_opt); - err =__hci_cmd_sync_status (hdev,HCI_OP_WRITE_DEF_LINK_POLICY , -2 , &policy, -HCI_CMD_TIMEOUT ); + err =hci_cmd_sync_status (hdev,HCI_OP_WRITE_DEF_LINK_POLICY , +2 , &policy,HCI_CMD_TIMEOUT );break ;case HCISETLINKMODE :
Signature · 1 line
2.45.2
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=867201
---Test result---
Test Summary:
CheckPatch PASS 0.68 seconds GitLint PASS 0.32 seconds SubjectPrefix PASS 0.12 seconds BuildKernel PASS 29.86 seconds CheckAllWarning PASS 32.68 seconds CheckSparse PASS 38.01 seconds CheckSmatch PASS 104.31 seconds BuildKernel32 PASS 29.11 seconds TestRunnerSetup PASS 528.53 seconds TestRunner_l2cap-tester PASS 26.19 seconds TestRunner_iso-tester PASS 34.75 seconds TestRunner_bnep-tester PASS 4.91 seconds TestRunner_mgmt-tester PASS 110.25 seconds TestRunner_rfcomm-tester PASS 7.47 seconds TestRunner_sco-tester PASS 15.10 seconds TestRunner_ioctl-tester PASS 7.94 seconds TestRunner_mesh-tester FAIL 6.10 seconds TestRunner_smp-tester PASS 7.00 seconds TestRunner_userchan-tester PASS 5.09 seconds IncrementalBuild PASS 28.19 seconds
Details
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner Output:
Total: 10, Passed: 9 (90.0%), Failed: 1, Not Run: 0
Failed Test Cases
Mesh - Send cancel - 2 Failed 0.095 seconds
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 10 lines · On Mon, 1 Jul 2024 12:11:00 -0400 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
__hci_cmd_sync_statusshall only be used ifhci_req_sync_lockis _not_ required which is not the case ofhci_dev_cmdso it needs to usehci_cmd_sync_statuswhich useshci_req_sync_lockinternally.Fixes 6851d11d389c ("Bluetooth: Fix double free in hci_req_sync_complete")Signed-off-by Luiz Augusto von Dentz <[email protected]>[...]
Here is the summary with links:
- [v1] Bluetooth: Fix usage of __hci_cmd_sync_status
https://git.kernel.org/bluetooth/bluetooth-next/c/7b256038ca7c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html