Skip to content

Commit 65bd223

Browse files
Alain Michaudgregkh
Alain Michaud
authored andcommitted
Bluetooth: fix kernel oops in store_pending_adv_report
commit a2ec905 upstream. Fix kernel oops observed when an ext adv data is larger than 31 bytes. This can be reproduced by setting up an advertiser with advertisement larger than 31 bytes. The issue is not sensitive to the advertisement content. In particular, this was reproduced with an advertisement of 229 bytes filled with 'A'. See stack trace below. This is fixed by not catching ext_adv as legacy adv are only cached to be able to concatenate a scanable adv with its scan response before sending it up through mgmt. With ext_adv, this is no longer necessary. general protection fault: 0000 [#1] SMP PTI CPU: 6 PID: 205 Comm: kworker/u17:0 Not tainted 5.4.0-37-generic #41-Ubuntu Hardware name: Dell Inc. XPS 15 7590/0CF6RR, BIOS 1.7.0 05/11/2020 Workqueue: hci0 hci_rx_work [bluetooth] RIP: 0010:hci_bdaddr_list_lookup+0x1e/0x40 [bluetooth] Code: ff ff e9 26 ff ff ff 0f 1f 44 00 00 0f 1f 44 00 00 55 48 8b 07 48 89 e5 48 39 c7 75 0a eb 24 48 8b 00 48 39 f8 74 1c 44 8b 06 <44> 39 40 10 75 ef 44 0f b7 4e 04 66 44 39 48 14 75 e3 38 50 16 75 RSP: 0018:ffffbc6a40493c70 EFLAGS: 00010286 RAX: 4141414141414141 RBX: 000000000000001b RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffff9903e76c100f RDI: ffff9904289d4b28 RBP: ffffbc6a40493c70 R08: 0000000093570362 R09: 0000000000000000 R10: 0000000000000000 R11: ffff9904344eae38 R12: ffff9904289d4000 R13: 0000000000000000 R14: 00000000ffffffa3 R15: ffff9903e76c100f FS: 0000000000000000(0000) GS:ffff990434580000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007feed125a000 CR3: 00000001b860a003 CR4: 00000000003606e0 Call Trace: process_adv_report+0x12e/0x560 [bluetooth] hci_le_meta_evt+0x7b2/0xba0 [bluetooth] hci_event_packet+0x1c29/0x2a90 [bluetooth] hci_rx_work+0x19b/0x360 [bluetooth] process_one_work+0x1eb/0x3b0 worker_thread+0x4d/0x400 kthread+0x104/0x140 Fixes: c215e93 ("Bluetooth: Process extended ADV report event") Reported-by: Andy Nguyen <[email protected]> Reported-by: Linus Torvalds <[email protected]> Reported-by: Balakrishna Godavarthi <[email protected]> Signed-off-by: Alain Michaud <[email protected]> Tested-by: Sonny Sasaka <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 2ef5689 commit 65bd223

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

net/bluetooth/hci_event.c

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,9 @@ static void store_pending_adv_report(struct hci_dev *hdev, bdaddr_t *bdaddr,
11331133
{
11341134
struct discovery_state *d = &hdev->discovery;
11351135

1136+
if (len > HCI_MAX_AD_LENGTH)
1137+
return;
1138+
11361139
bacpy(&d->last_adv_addr, bdaddr);
11371140
d->last_adv_addr_type = bdaddr_type;
11381141
d->last_adv_rssi = rssi;
@@ -4779,6 +4782,11 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
47794782
return;
47804783
}
47814784

4785+
if (len > HCI_MAX_AD_LENGTH) {
4786+
pr_err_ratelimited("legacy adv larger than 31 bytes");
4787+
return;
4788+
}
4789+
47824790
/* Find the end of the data in case the report contains padded zero
47834791
* bytes at the end causing an invalid length value.
47844792
*
@@ -4839,7 +4847,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
48394847
*/
48404848
conn = check_pending_le_conn(hdev, bdaddr, bdaddr_type, type,
48414849
direct_addr);
4842-
if (conn && type == LE_ADV_IND) {
4850+
if (conn && type == LE_ADV_IND && len <= HCI_MAX_AD_LENGTH) {
48434851
/* Store report for later inclusion by
48444852
* mgmt_device_connected
48454853
*/
@@ -4964,10 +4972,14 @@ static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)
49644972
struct hci_ev_le_advertising_info *ev = ptr;
49654973
s8 rssi;
49664974

4967-
rssi = ev->data[ev->length];
4968-
process_adv_report(hdev, ev->evt_type, &ev->bdaddr,
4969-
ev->bdaddr_type, NULL, 0, rssi,
4970-
ev->data, ev->length);
4975+
if (ev->length <= HCI_MAX_AD_LENGTH) {
4976+
rssi = ev->data[ev->length];
4977+
process_adv_report(hdev, ev->evt_type, &ev->bdaddr,
4978+
ev->bdaddr_type, NULL, 0, rssi,
4979+
ev->data, ev->length);
4980+
} else {
4981+
bt_dev_err(hdev, "Dropping invalid advertising data");
4982+
}
49714983

49724984
ptr += sizeof(*ev) + ev->length + 1;
49734985
}

0 commit comments

Comments
 (0)