espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 05:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_ble_aa_check_v2' into 'master'

Browse Source 
Optimize check Access Address when receive connection request PDU

Closes BLERP-2036

See merge request espressif/esp-idf!40162
This commit is contained in:
Island
2025-07-04 14:03:44 +08:00
parent 3f9a8953c4 a663a87fe0
commit 63f7d7eadf
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/bt/controller/esp32/Kconfig.in
View File

@@ -459,6 +459,7 @@ config BTDM_CTRL_SCAN_BACKOFF_UPPERLIMITMAX
config BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS config BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
bool "Enable enhanced Access Address check in CONNECT_IND" bool "Enable enhanced Access Address check in CONNECT_IND"
depends on (BTDM_CTRL_MODE_BLE_ONLY || BTDM_CTRL_MODE_BTDM)
default n default n
help help
Enabling this option will add stricter verification of the Access Address in the CONNECT_IND PDU. Enabling this option will add stricter verification of the Access Address in the CONNECT_IND PDU.

5
components/bt/controller/esp32/bt.c
View File

@@ -252,6 +252,7 @@ extern uint32_t _bt_controller_data_end;
extern void config_bt_funcs_reset(void); extern void config_bt_funcs_reset(void);
extern void config_ble_funcs_reset(void); extern void config_ble_funcs_reset(void);
extern void config_btdm_funcs_reset(void); extern void config_btdm_funcs_reset(void);
extern void btdm_aa_check_enhance_enable(void);
#ifdef CONFIG_BT_BLUEDROID_ENABLED #ifdef CONFIG_BT_BLUEDROID_ENABLED
extern void bt_stack_enableSecCtrlVsCmd(bool en); extern void bt_stack_enableSecCtrlVsCmd(bool en);
@@ -1851,6 +1852,10 @@ static void patch_apply(void)
#ifndef CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY #ifndef CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY
config_ble_funcs_reset(); config_ble_funcs_reset();
#endif #endif
#if BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS_ENABLED
btdm_aa_check_enhance_enable();
#endif
} }
esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode) esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)

2
components/bt/controller/lib_esp32

Submodule components/bt/controller/lib_esp32 updated: b0ebfcf639...8243fcc96f