Commit f7e0e8b2 authored by Peilin Ye's avatar Peilin Ye Committed by Marcel Holtmann
Browse files

Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() 



`num_reports` is not being properly checked. A malformed event packet with
a large `num_reports` number makes hci_le_direct_adv_report_evt() read out
of bounds. Fix it.

Cc: stable@vger.kernel.org
Fixes: 2f010b55 ("Bluetooth: Add support for handling LE Direct Advertising Report events")
Reported-and-tested-by: default avatar <syzbot+24ebd650e20bd263ca01@syzkaller.appspotmail.com>
Link: https://syzkaller.appspot.com/bug?extid=24ebd650e20bd263ca01


Signed-off-by: default avatarPeilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 70f259a3

net/bluetooth/hci_event.c

+5 −7
Original line number Diff line number Diff line
@@ -5873,21 +5873,19 @@ static void hci_le_direct_adv_report_evt(struct hci_dev *hdev, 
					 struct sk_buff *skb)

{

	u8 num_reports = skb->data[0];

	void *ptr = &skb->data[1];

	struct hci_ev_le_direct_adv_info *ev = (void *)&skb->data[1];



	hci_dev_lock(hdev);

	if (!num_reports || skb->len < num_reports * sizeof(*ev) + 1)

		return;



	while (num_reports--) {

		struct hci_ev_le_direct_adv_info *ev = ptr;

	hci_dev_lock(hdev);



	for (; num_reports; num_reports--, ev++)

		process_adv_report(hdev, ev->evt_type, &ev->bdaddr,

				   ev->bdaddr_type, &ev->direct_addr,

				   ev->direct_addr_type, ev->rssi, NULL, 0,

				   false);



		ptr += sizeof(*ev);

	}



	hci_dev_unlock(hdev);

}