Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt()
PATCH 1/1 Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt()
commit f7e0e8b2f1b0a09b527885babda3e912ba820798 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.
Backporting notes:
- Rebased on linux-4.14.y, commit 3f2ecb86cb90 ("Linux 4.14.212")
- Retested by syzbot
--- net/bluetooth/hci_event.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
net/bluetooth/hci_event.c +5 -7
@@ -5141,20 +5141,18 @@ 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 ); - ptr +=sizeof (*ev); - } -hci_dev_unlock (hdev); }
Signature · 1 line
2.25.1
Greg KH
maintainerQuoted 16 lines · Peilin Ye
commit
f7e0e8b2f1b0a09b527885babda3e912ba820798upstream.
num_reportsis not being properly checked. A malformed event packet with a largenum_reportsnumber makeshci_le_direct_adv_report_evt()read out of bounds. Fix it.Backporting notes:
- Rebased on linux-4.14.y, commit3f2ecb86cb90("Linux 4.14.212")
- Retested by syzbotFixes 2f010b55884e ("Bluetooth: Add support for handling LE Direct Advertising Report events")Reported-and-tested-by [email protected]Signed-off-by Peilin Ye <[email protected]>Signed-off-by Marcel Holtmann <[email protected]>
Quoted 3 lines
--- net/bluetooth/hci_event.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
Thanks for the backport, now queued up!
greg k-h
Quoted 21 lines · Greg KH
Quoted 16 lines · Peilin Ye
commit
f7e0e8b2f1b0a09b527885babda3e912ba820798upstream.
num_reportsis not being properly checked. A malformed event packet with a largenum_reportsnumber makeshci_le_direct_adv_report_evt()read out of bounds. Fix it.Backporting notes:
- Rebased on linux-4.14.y, commit3f2ecb86cb90("Linux 4.14.212")
- Retested by syzbotFixes 2f010b55884e ("Bluetooth: Add support for handling LE Direct Advertising Report events")Reported-and-tested-by [email protected]Signed-off-by Peilin Ye <[email protected]>Signed-off-by Marcel Holtmann <[email protected]>Quoted 3 lines
--- net/bluetooth/hci_event.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
Quoted 1 line
Thanks for the backport, now queued up!
<offlist>
No problem! It's 24th in China - Merry Christmas!
Peilin