diff options
| author | Pauli Virtanen <pav@iki.fi> | 2023-06-01 08:34:44 +0200 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2023-06-06 02:14:07 +0200 |
| commit | 6c242c64a09e78349fb0a5f0a6f8076a3d7c0bb4 (patch) | |
| tree | 2646f9db0c50ecb99c7ecf64d45750e186f33c9e /net/bluetooth/hci_conn.c | |
| parent | Bluetooth: Fix l2cap_disconnect_req deadlock (diff) | |
| download | linux-6c242c64a09e78349fb0a5f0a6f8076a3d7c0bb4.tar.xz linux-6c242c64a09e78349fb0a5f0a6f8076a3d7c0bb4.zip | |
Bluetooth: ISO: don't try to remove CIG if there are bound CIS left
Consider existing BOUND & CONNECT state CIS to block CIG removal.
Otherwise, under suitable timing conditions we may attempt to remove CIG
while Create CIS is pending, which fails.
Fixes: 26afbd826ee3 ("Bluetooth: Add initial implementation of CIS connections")
Signed-off-by: Pauli Virtanen <pav@iki.fi>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 1f906f8508bc..1ef952bda97d 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -972,6 +972,8 @@ static void cis_cleanup(struct hci_conn *conn) /* Check if ISO connection is a CIS and remove CIG if there are * no other connections using it. */ + hci_conn_hash_list_state(hdev, find_cis, ISO_LINK, BT_BOUND, &d); + hci_conn_hash_list_state(hdev, find_cis, ISO_LINK, BT_CONNECT, &d); hci_conn_hash_list_state(hdev, find_cis, ISO_LINK, BT_CONNECTED, &d); if (d.count) return; |