Bluetooth: ISO: Fix invalid context error
authorIulia Tanasescu <iulia.tanasescu@nxp.com>
Thu, 28 Sep 2023 07:52:57 +0000 (10:52 +0300)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 11 Oct 2023 18:15:40 +0000 (11:15 -0700)
This moves the hci_le_terminate_big_sync call from rx_work
to cmd_sync_work, to avoid calling sleeping function from
an invalid context.

Reported-by: syzbot+c715e1bd8dfbcb1ab176@syzkaller.appspotmail.com
Fixes: a0bfde167b50 ("Bluetooth: ISO: Add support for connecting multiple BISes")
Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
net/bluetooth/hci_event.c

index 31d02b5..e6cfc65 100644 (file)
@@ -7021,6 +7021,14 @@ unlock:
        hci_dev_unlock(hdev);
 }
 
+static int hci_iso_term_big_sync(struct hci_dev *hdev, void *data)
+{
+       u8 handle = PTR_UINT(data);
+
+       return hci_le_terminate_big_sync(hdev, handle,
+                                        HCI_ERROR_LOCAL_HOST_TERM);
+}
+
 static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
                                           struct sk_buff *skb)
 {
@@ -7065,16 +7073,17 @@ static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
                rcu_read_lock();
        }
 
+       rcu_read_unlock();
+
        if (!ev->status && !i)
                /* If no BISes have been connected for the BIG,
                 * terminate. This is in case all bound connections
                 * have been closed before the BIG creation
                 * has completed.
                 */
-               hci_le_terminate_big_sync(hdev, ev->handle,
-                                         HCI_ERROR_LOCAL_HOST_TERM);
+               hci_cmd_sync_queue(hdev, hci_iso_term_big_sync,
+                                  UINT_PTR(ev->handle), NULL);
 
-       rcu_read_unlock();
        hci_dev_unlock(hdev);
 }