Merge branch 'feat/added_nonblocking_mode_for_hci_alloc_6.1' into 'release/v6.1'

fix(bt): fixed multiple CVE issues for Bluetooth Classic Controller See merge request espressif/esp-idf!52846
2026-10-01 18:50:34 +03:00 · 2026-09-16 10:07:35 +08:00
parent 51b266a62b 0ef1beb7cd
commit dea8a6bbdf
11 changed files with 284 additions and 75 deletions
@@ -239,6 +239,7 @@ extern int btdm_common_sched_bredr_on_sched_hw_list_done(void *param);
 extern int hci_tl_bredr_on_rx_cmd_c2h_num_pkt(void *param);
 extern int hci_tl_bredr_on_rx_cmd_set_c2h_flow_ctrl(void *param);
 extern int odm_afh_on_coex_wifi_channel_change(void *param);
+extern int olc_acl_on_coex_schm_update(void *param);
 extern int olc_intc_on_hal_exit_isr(void *param);
 extern int olc_sleep_on_sched_actual_time_get(void *param);
 extern int olc_sleep_on_sched_get_earlist_ticks(void *param);
@@ -406,11 +407,14 @@ const void * const _base_linear_broker_flash[] = BTDM_BROKER_NODE_DEF_FLASH(
 #endif /* UC_BT_CTRL_BLE_IS_ENABLE */

 const void * const _btdm_coex_linear_broker_flash[] = BTDM_BROKER_NODE_DEF_FLASH(
-#if UC_BT_CTRL_BLE_IS_ENABLE
    [1] = BTDM_BROKER_ENTRY_DEF_FLASH(
+#if UC_BT_CTRL_BLE_IS_ENABLE
              brk_sym_coexHook_WcEp3uxRHd6HYgB0pn0L,
-          ),
 #endif /* UC_BT_CTRL_BLE_IS_ENABLE */
+#if UC_BT_CTRL_BR_EDR_IS_ENABLE
+              olc_acl_on_coex_schm_update,
+#endif /* UC_BT_CTRL_BR_EDR_IS_ENABLE */
+          ),
    [2] = BTDM_BROKER_ENTRY_DEF_FLASH(
 #if UC_BT_CTRL_BLE_IS_ENABLE
              brk_sym_coexHook_wiWNhAUWlHyTZ7Z5ZC5Z,