Skip to content

Commit

Permalink
Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt()
Browse files Browse the repository at this point in the history
commit f7e0e8b upstream.

`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: 2f010b5 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
ypl-coffee authored and gregkh committed Dec 30, 2020
1 parent cda2f22 commit df95ea1
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions net/bluetooth/hci_event.c
Expand Up @@ -5711,21 +5711,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);
}

Expand Down

0 comments on commit df95ea1

Please sign in to comment.