Merge branch 'bugfix/fix_ble_aa_check_v2_v5.4' into 'release/v5.4'

Optimize check Access Address when receive connection request PDU (v5.4)

See merge request espressif/esp-idf!40749
This commit is contained in:
Island
2025-07-30 16:55:23 +08:00
2 changed files with 6 additions and 0 deletions

View File

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

View File

@@ -252,6 +252,7 @@ extern uint32_t _bt_controller_data_end;
extern void config_bt_funcs_reset(void);
extern void config_ble_funcs_reset(void);
extern void config_btdm_funcs_reset(void);
extern void btdm_aa_check_enhance_enable(void);
#ifdef CONFIG_BT_BLUEDROID_ENABLED
extern void bt_stack_enableSecCtrlVsCmd(bool en);
@@ -1854,6 +1855,10 @@ static void patch_apply(void)
#ifndef CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY
config_ble_funcs_reset();
#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)