From: Niels Dossche Date: Wed, 16 Mar 2022 15:33:50 +0000 (+0100) Subject: Bluetooth: call hci_le_conn_failed with hdev lock in hci_le_conn_failed X-Git-Tag: v5.18-rc1~136^2~36^2~9 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9fa6b4cda3b414e990f008f45f9bcecbcb54d4d1;p=linux-block.git Bluetooth: call hci_le_conn_failed with hdev lock in hci_le_conn_failed 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 Signed-off-by: Marcel Holtmann --- diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index d10651108033..84312c836549 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; }