Bluetooth: hci_sync: hold hdev->lock when cleanup hci_conn

When disconnecting all devices, hci_conn_failed is used to cleanup
hci_conn object when the hci_conn object cannot be aborted.
The function hci_conn_failed requires the caller holds hdev->lock.

Fixes: 9b3628d79b46f ("Bluetooth: hci_sync: Cleanup hci_conn if it cannot be aborted")
Signed-off-by: Zhengping Jiang <jiangzp@google.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 74a0cd5d0b37f37fb01f28f3931655ebebd7efd4..e08c0503027d8e20d3d8aae9b578695ed0dba71b 100644 (file)
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -5034,9 +5034,11 @@ int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason)
                /* Cleanup hci_conn object if it cannot be cancelled as it
                 * likelly means the controller and host stack are out of sync.
                 */
-               if (err)
+               if (err) {
+                       hci_dev_lock(hdev);
                        hci_conn_failed(conn, err);
-
+                       hci_dev_unlock(hdev);
+               }
                return err;
        case BT_CONNECT2:
                return hci_reject_conn_sync(hdev, conn, reason);