Bluetooth: hci_sync: Fix overwriting request callback
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v3 1/1 Bluetooth: hci_sync: Fix overwriting request callback
From: Luiz Augusto von Dentz <[email protected]>
In a few cases the stack may generate commands as responses to events which would happen to overwrite the sent_cmd, so this attempts to store the request in req_skb so even if sent_cmd is replaced with a new command the pending request will remain in stored in req_skb.
--- include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_conn.c | 2 +- net/bluetooth/hci_core.c | 46 ++++++++++++++++++++++---------- net/bluetooth/hci_event.c | 18 ++++++------- net/bluetooth/hci_sync.c | 21 ++++++++++++--- 5 files changed, 61 insertions(+), 27 deletions(-)
include/net/bluetooth/hci_core.h +1 -0
@@ -552,6 +552,7 @@ struct hci_dev {__u32 req_status;__u32 req_result;struct sk_buff *req_skb; +struct sk_buff *req_rsp;void *smp_data;void *smp_bredr_data;
net/bluetooth/hci_conn.c +1 -1
@@ -2918,7 +2918,7 @@ int hci_abort_conn(struct hci_conn *conn, u8 reason)case HCI_EV_LE_CONN_COMPLETE :case HCI_EV_LE_ENHANCED_CONN_COMPLETE :case HCI_EVT_LE_CIS_ESTABLISHED : -hci_cmd_sync_cancel (hdev, -ECANCELED ); +hci_cmd_sync_cancel (hdev,ECANCELED );break ; }/* Cancel connect attempt if still queued/pending */
net/bluetooth/hci_core.c +32 -14
92 lines not on this page · raw message
net/bluetooth/hci_event.c +9 -9
@@ -4368,7 +4368,7 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, void *data,* (since for this kind of commands there will not be a command * complete event). */ -if (ev->status || (hdev->sent_cmd && !hci_skb_event (hdev->sent_cmd))) { +if (ev->status || (hdev->req_skb && !hci_skb_event (hdev->req_skb))) {hci_req_cmd_complete (hdev, *opcode, ev->status, req_complete, req_complete_skb);if (hci_dev_test_flag (hdev,HCI_CMD_PENDING )) {
@@ -7170,10 +7170,10 @@ static void hci_le_meta_evt(struct hci_dev *hdev, void *data,bt_dev_dbg (hdev,"subevent 0x%2.2x" , ev->subevent);/* Only match event if command OGF is for LE */ -if (hdev->sent_cmd && -hci_opcode_ogf (hci_skb_opcode (hdev->sent_cmd)) ==0x08 && -hci_skb_event (hdev->sent_cmd) == ev->subevent) { - *opcode =hci_skb_opcode (hdev->sent_cmd); +if (hdev->req_skb && +hci_opcode_ogf (hci_skb_opcode (hdev->req_skb)) ==0x08 && +hci_skb_event (hdev->req_skb) == ev->subevent) { + *opcode =hci_skb_opcode (hdev->req_skb);hci_req_cmd_complete (hdev, *opcode,0x00 , req_complete, req_complete_skb); }
@@ -7541,10 +7541,10 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) }/* Only match event if command OGF is not for LE */ -if (hdev->sent_cmd && -hci_opcode_ogf (hci_skb_opcode (hdev->sent_cmd)) !=0x08 && -hci_skb_event (hdev->sent_cmd) == event) { -hci_req_cmd_complete (hdev,hci_skb_opcode (hdev->sent_cmd), +if (hdev->req_skb && +hci_opcode_ogf (hci_skb_opcode (hdev->req_skb)) !=0x08 && +hci_skb_event (hdev->req_skb) == event) { +hci_req_cmd_complete (hdev,hci_skb_opcode (hdev->req_skb), status, &req_complete, &req_complete_skb); req_evt = event; }
net/bluetooth/hci_sync.c +18 -3
@@ -32,6 +32,10 @@ static void hci_cmd_sync_complete(struct hci_dev *hdev, u8 result, u16 opcode, hdev->req_result = result; hdev->req_status =HCI_REQ_DONE ; +/* Free the request command so it is not used as response */ +kfree_skb (hdev->req_skb); + hdev->req_skb =NULL ; +if (skb) {struct sock *sk =hci_skb_sk (skb);
@@ -39,7 +43,7 @@ static void hci_cmd_sync_complete(struct hci_dev *hdev, u8 result, u16 opcode,if (sk)sock_put (sk); - hdev->req_skb =skb_get (skb); + hdev->req_rsp =skb_get (skb); }wake_up_interruptible (&hdev->req_wait_q);
@@ -187,8 +191,8 @@ struct sk_buff *__hci_cmd_sync_sk(struct hci_dev *hdev, u16 opcode, u32 plen, hdev->req_status =0 ; hdev->req_result =0 ; - skb = hdev->req_skb; - hdev->req_skb =NULL ; + skb = hdev->req_rsp; + hdev->req_rsp =NULL ;bt_dev_dbg (hdev,"end: err %d" , err);
@@ -5021,6 +5025,11 @@ int hci_dev_open_sync(struct hci_dev *hdev) hdev->sent_cmd =NULL ; } +if (hdev->req_skb) { +kfree_skb (hdev->req_skb); + hdev->req_skb =NULL ; + } +clear_bit (HCI_RUNNING , &hdev->flags);hci_sock_dev_event (hdev,HCI_DEV_CLOSE );
@@ -5181,6 +5190,12 @@ int hci_dev_close_sync(struct hci_dev *hdev) hdev->sent_cmd =NULL ; } +/* Drop last request */ +if (hdev->req_skb) { +kfree_skb (hdev->req_skb); + hdev->req_skb =NULL ; + } +clear_bit (HCI_RUNNING , &hdev->flags);hci_sock_dev_event (hdev,HCI_DEV_CLOSE );
Signature · 1 line
2.43.0
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=830444
---Test result---
Test Summary:
CheckPatch PASS 1.26 seconds GitLint PASS 0.22 seconds SubjectPrefix PASS 0.07 seconds BuildKernel PASS 27.56 seconds CheckAllWarning PASS 30.30 seconds CheckSparse WARNING 35.87 seconds CheckSmatch WARNING 97.82 seconds BuildKernel32 PASS 26.81 seconds TestRunnerSetup PASS 498.43 seconds TestRunner_l2cap-tester PASS 18.17 seconds TestRunner_iso-tester PASS 32.34 seconds TestRunner_bnep-tester PASS 4.76 seconds TestRunner_mgmt-tester PASS 112.17 seconds TestRunner_rfcomm-tester PASS 7.30 seconds TestRunner_sco-tester PASS 14.96 seconds TestRunner_ioctl-tester PASS 7.79 seconds TestRunner_mesh-tester PASS 5.85 seconds TestRunner_smp-tester PASS 6.85 seconds TestRunner_userchan-tester PASS 4.90 seconds IncrementalBuild PASS 25.51 seconds
Details
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
---
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 8 lines · On Tue, 27 Feb 2024 17:04:28 -0500 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
In a few cases the stack may generate commands as responses to events which would happen to overwrite the
sent_cmd, so this attempts to store the request inreq_skbso even ifsent_cmdis replaced with a new command the pending request will remain in stored inreq_skb.[...]
Here is the summary with links:
- [v3] Bluetooth: hci_sync: Fix overwriting request callback
https://git.kernel.org/bluetooth/bluetooth-next/c/afe04d6e61dd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html