From 0cedaa3291c8e8b8752a4114dacfd4fd32e2cf80 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Mon, 23 Sep 2024 15:10:28 +0200 Subject: [PATCH] nimble/host: Validate advertising instance before parsing event Advertising instance is used for indexing slave state array. Since instance is provided by host invalid handle in event means there is bug in controller. --- nimble/host/src/ble_hs_hci_evt.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nimble/host/src/ble_hs_hci_evt.c b/nimble/host/src/ble_hs_hci_evt.c index 263d35e51..5b6cdf99a 100644 --- a/nimble/host/src/ble_hs_hci_evt.c +++ b/nimble/host/src/ble_hs_hci_evt.c @@ -940,6 +940,13 @@ ble_hs_hci_evt_le_adv_set_terminated(uint8_t subevent, const void *data, return BLE_HS_ECONTROLLER; } + /* this indicates bug in controller as host uses instances from + * 0-BLE_ADV_INSTANCES range only + */ + if (ev->adv_handle >= BLE_ADV_INSTANCES) { + return BLE_HS_ECONTROLLER; + } + if (ev->status == 0) { /* ignore return code as we need to terminate advertising set anyway */ ble_gap_rx_conn_complete(&pend_conn_complete, ev->adv_handle); @@ -961,6 +968,13 @@ ble_hs_hci_evt_le_scan_req_rcvd(uint8_t subevent, const void *data, return BLE_HS_ECONTROLLER; } + /* this indicates bug in controller as host uses instances from + * 0-BLE_ADV_INSTANCES range only + */ + if (ev->adv_handle >= BLE_ADV_INSTANCES) { + return BLE_HS_ECONTROLLER; + } + ble_gap_rx_scan_req_rcvd(ev); #endif