Commit acab8ff2 authored by Iulia Tanasescu's avatar Iulia Tanasescu Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: ISO: Fix invalid context error 



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: default avatar <syzbot+c715e1bd8dfbcb1ab176@syzkaller.appspotmail.com>
Fixes: a0bfde16 ("Bluetooth: ISO: Add support for connecting multiple BISes")
Signed-off-by: default avatarIulia Tanasescu <iulia.tanasescu@nxp.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 92d4abd6

net/bluetooth/hci_event.c

+12 −3
Original line number Diff line number Diff line
@@ -7021,6 +7021,14 @@ static void hci_le_cis_req_evt(struct hci_dev *hdev, void *data, 
	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);

}