Bluetooth: hci_event: Fix checking conn for le_conn_complete_evt

Commit Message

Archie Pusaka Aug. 23, 2022, 4:39 a.m. UTC

From: Archie Pusaka <[e-mail]>

To prevent multiple conn complete events, we shouldn't look up the
conn with hci_lookup_le_connect, since it requires the state to be
BT_CONNECT. By the time the duplicate event is processed, the state
might have changed, so we end up processing the new event anyway.

Change the lookup function to hci_conn_hash_lookup_ba.

Fixes: d5ebaa7c5f6f6 ("Bluetooth: hci_event: Ignore multiple conn complete events")
Signed-off-by: Archie Pusaka <[e-mail]>
Reviewed-by: Sonny Sasaka <[e-mail]>

---

 net/bluetooth/hci_event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

[e-mail] Aug. 23, 2022, 5:25 a.m. UTC | #1

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=670004

---Test result---

Test Summary:
CheckPatch                    PASS      1.63 seconds
GitLint                       PASS      1.00 seconds
SubjectPrefix                 PASS      0.87 seconds
BuildKernel                   PASS      35.04 seconds
BuildKernel32                 PASS      30.50 seconds
Incremental Build with patchesPASS      43.10 seconds
TestRunner: Setup             PASS      490.36 seconds
TestRunner: l2cap-tester      PASS      18.29 seconds
TestRunner: bnep-tester       PASS      7.13 seconds
TestRunner: mgmt-tester       PASS      107.36 seconds
TestRunner: rfcomm-tester     PASS      10.62 seconds
TestRunner: sco-tester        PASS      10.54 seconds
TestRunner: smp-tester        PASS      10.42 seconds
TestRunner: userchan-tester   PASS      7.52 seconds



---
Regards,
Linux Bluetooth

[e-mail] Aug. 24, 2022, 10:30 p.m. UTC | #2

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Tue, 23 Aug 2022 12:39:22 +0800 you wrote:
> From: Archie Pusaka <[e-mail]>
> 
> To prevent multiple conn complete events, we shouldn't look up the
> conn with hci_lookup_le_connect, since it requires the state to be
> BT_CONNECT. By the time the duplicate event is processed, the state
> might have changed, so we end up processing the new event anyway.
> 
> [...]

Here is the summary with links:
  - Bluetooth: hci_event: Fix checking conn for le_conn_complete_evt
    https://git.kernel.org/bluetooth/bluetooth-next/c/045f23cf75a8

You are awesome, thank you!

Patch

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 938abe6352bf..1906822a061b 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -5801,7 +5801,7 @@  static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,
 	 */
 	hci_dev_clear_flag(hdev, HCI_LE_ADV);
 
-	conn = hci_lookup_le_connect(hdev);
+	conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, bdaddr);
 	if (!conn) {
 		/* In case of error status and there is no connection pending
 		 * just unlock as there is nothing to cleanup.