Bluetooth: hci_event: Disconnect device when BIG sync is lost

[ Upstream commit 55b9551fcdf6a2fe7f3422918d5697b56794da72 ]

When a BIG sync is lost, the device should be set to "disconnected".
This ensures symmetry with the ISO path setup, where the device is
marked as "connected" once the path is established. Without this
change, the device state remains inconsistent and may lead to a
memory leak.

Fixes: b2a5f2e1c127 ("Bluetooth: hci_event: Add support for handling LE BIG Sync Lost event")
Signed-off-by: Yang Li <yang.li@amlogic.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 02b2ef9a757466f7dc238d9bfa48977873704023..0ffdbe249f5d3d97b1374f9d1cf609a67529e379 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -7019,6 +7019,7 @@ static void hci_le_big_sync_lost_evt(struct hci_dev *hdev, void *data,
 {
        struct hci_evt_le_big_sync_lost *ev = data;
        struct hci_conn *bis, *conn;
+       bool mgmt_conn;
 
        bt_dev_dbg(hdev, "big handle 0x%2.2x", ev->handle);
 
@@ -7037,6 +7038,10 @@ static void hci_le_big_sync_lost_evt(struct hci_dev *hdev, void *data,
        while ((bis = hci_conn_hash_lookup_big_state(hdev, ev->handle,
                                                     BT_CONNECTED,
                                                     HCI_ROLE_SLAVE))) {
+               mgmt_conn = test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &bis->flags);
+               mgmt_device_disconnected(hdev, &bis->dst, bis->type, bis->dst_type,
+                                        ev->reason, mgmt_conn);
+
                clear_bit(HCI_CONN_BIG_SYNC, &bis->flags);
                hci_disconn_cfm(bis, ev->reason);
                hci_conn_del(bis);

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 3166f5fb876b11843330e45e4ad997eb99b13d12..90e37ff2c85db239c8864d910c6708f3154506e0 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -9705,7 +9705,9 @@ void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
        if (!mgmt_connected)
                return;
 
-       if (link_type != ACL_LINK && link_type != LE_LINK)
+       if (link_type != ACL_LINK &&
+           link_type != LE_LINK  &&
+           link_type != BIS_LINK)
                return;
 
        bacpy(&ev.addr.bdaddr, bdaddr);