redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: 2f010b5588 ("Bluetooth: Add support for handling LE Direct Advertising Report events")
Reported-and-tested-by: syzbot+24ebd650e20bd263ca01@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?extid=24ebd650e20bd263ca01
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
zero-sugar-mainline-defconfig
Peilin Ye 2020-09-09 03:17:00 -04:00 committed by Marcel Holtmann
parent 70f259a3f4
commit f7e0e8b2f1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/bluetooth/hci_event.c
View File

@ -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];
if (!num_reports || skb->len < num_reports * sizeof(*ev) + 1)
return;
hci_dev_lock(hdev);
while (num_reports--) {
struct hci_ev_le_direct_adv_info *ev = ptr;
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);
}