diff mbox series

Bluetooth: hci_event: Fix checking conn for le_conn_complete_evt

Message ID 20220823123850.1.I0cb00facc6a47efc8cee54d5d4a02fadb388e5a5@changeid
State New
Headers show
Series Bluetooth: hci_event: Fix checking conn for le_conn_complete_evt | expand

Commit Message

Archie Pusaka Aug. 23, 2022, 4:39 a.m. UTC
From: Archie Pusaka <apusaka@chromium.org>

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 <apusaka@chromium.org>
Reviewed-by: Sonny Sasaka <sonnysasaka@chromium.org>

---

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

Comments

patchwork-bot+bluetooth@kernel.org Aug. 24, 2022, 10:30 p.m. UTC | #1
Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Tue, 23 Aug 2022 12:39:22 +0800 you wrote:
> From: Archie Pusaka <apusaka@chromium.org>
> 
> 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!
diff mbox series

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.