Bluetooth: call hci_le_conn_failed with hdev lock in hci_le_conn_failed

[ Upstream commit d18e8dc5eda575f15e32be71010a3e6ba3cc8157 ]

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: 059180c8f7ce ("Bluetooth: Add directed advertising support through connect()")
Signed-off-by: Niels Dossche <dossche.niels@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 2b5059a56cdaaad4ab24447d13d8e06e124957d6..7a7e92be1652c3b050f6a6754e1e7979be62fce7 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -541,7 +541,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;
        }