iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: ISO: Fix invalid context error

Browse Source 
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>
This commit is contained in:
Iulia Tanasescu 2023-09-28 10:52:57 +03:00 committed by Luiz Augusto von Dentz
parent 92d4abd66f
commit acab8ff29a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/bluetooth/hci_event.c
View File

@ -7021,6 +7021,14 @@ unlock:
hci_dev_unlock(hdev); 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, static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
struct sk_buff *skb) 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_lock();
} }
rcu_read_unlock();
if (!ev->status && !i) if (!ev->status && !i)
/* If no BISes have been connected for the BIG, /* If no BISes have been connected for the BIG,
* terminate. This is in case all bound connections * terminate. This is in case all bound connections
* have been closed before the BIG creation * have been closed before the BIG creation
* has completed. * has completed.
*/ */
hci_le_terminate_big_sync(hdev, ev->handle, hci_cmd_sync_queue(hdev, hci_iso_term_big_sync,
HCI_ERROR_LOCAL_HOST_TERM); UINT_PTR(ev->handle), NULL);
rcu_read_unlock();
hci_dev_unlock(hdev); hci_dev_unlock(hdev);
} }