diff options
| author |   Zhengping Jiang <jiangzp@google.com> | 2022-08-23 10:28:08 -0700 |
|---|---|---|
| committer |   Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2022-08-25 16:26:19 -0700 |
| commit | 2da8eb834b775a9d1acea6214d3e4a78ac841e6e (patch) | |
| tree | aee399c0b7312482b5b5c04d307a573be9bda4d7 /net/bluetooth/hci_sync.c | |
| parent | Bluetooth: move from strlcpy with unused retval to strscpy (diff) | |
| download | linux-dev-2da8eb834b775a9d1acea6214d3e4a78ac841e6e.tar.xz linux-dev-2da8eb834b775a9d1acea6214d3e4a78ac841e6e.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | net/bluetooth/hci_sync.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 5fe440cdc68d..187786454d98 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -4773,9 +4773,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); |