| Message ID | 20220316153350.10047-1-dossche.niels@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7c686a32a512b795a45e76224855c69e3a8070d7 |
| Headers | show |
| Series | Bluetooth: call hci_le_conn_failed with hdev lock in hci_le_conn_failed | expand |
Hi Niels, > hci_le_conn_failed function's documentation says that the caller must > hold hdev->lock. The only callsite that does not hold that lock is > hci_le_conn_failed. The other 3 callsites hold the hdev->lock very > locally. The solution is to hold the lock during the call to > hci_le_conn_failed. > > Fixes: 3c857757ef6e ("Bluetooth: Add directed advertising support through connect()") > Signed-off-by: Niels Dossche <dossche.niels@gmail.com> > --- > net/bluetooth/hci_conn.c | 2 ++ > 1 file changed, 2 insertions(+) patch has been applied to bluetooth-next tree. Regards Marcel
Hello: This patch was applied to bluetooth/bluetooth-next.git (master) by Marcel Holtmann <marcel@holtmann.org>: On Wed, 16 Mar 2022 16:33:50 +0100 you wrote: > hci_le_conn_failed function's documentation says that the caller must > hold hdev->lock. The only callsite that does not hold that lock is > hci_le_conn_failed. The other 3 callsites hold the hdev->lock very > locally. The solution is to hold the lock during the call to > hci_le_conn_failed. > > Fixes: 3c857757ef6e ("Bluetooth: Add directed advertising support through connect()") > Signed-off-by: Niels Dossche <dossche.niels@gmail.com> > > [...] Here is the summary with links: - Bluetooth: call hci_le_conn_failed with hdev lock in hci_le_conn_failed https://git.kernel.org/bluetooth/bluetooth-next/c/7c686a32a512 You are awesome, thank you!
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 04ebe901e86f..3bb2b3b6a1c9 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -669,7 +669,9 @@ static void le_conn_timeout(struct work_struct *work) if (conn->role == HCI_ROLE_SLAVE) { /* Disable LE Advertising */ le_disable_advertising(hdev); + hci_dev_lock(hdev); hci_le_conn_failed(conn, HCI_ERROR_ADVERTISING_TIMEOUT); + hci_dev_unlock(hdev); return; }
hci_le_conn_failed function's documentation says that the caller must hold hdev->lock. The only callsite that does not hold that lock is hci_le_conn_failed. The other 3 callsites hold the hdev->lock very locally. The solution is to hold the lock during the call to hci_le_conn_failed. Fixes: 3c857757ef6e ("Bluetooth: Add directed advertising support through connect()") Signed-off-by: Niels Dossche <dossche.niels@gmail.com> --- net/bluetooth/hci_conn.c | 2 ++ 1 file changed, 2 insertions(+)