Island
8f8afe6c98
Merge branch 'bugfix/fix_ble_pair_fail_v6.0' into 'release/v6.0'
...
fix(bt/bluedroid): fix BLE SMP pairing failure on BLE-only devices when using defalut param (6.0)
See merge request espressif/esp-idf!47401
2026-04-28 17:24:20 +08:00
Wang Meng Yang
622dcfb864
Merge branch 'bugfix/ai_review_hfp_v6.0' into 'release/v6.0'
...
fix(bt): fix HFP issues reported by AI code review (v6.0)
See merge request espressif/esp-idf!47761
2026-04-28 15:16:13 +08:00
Wang Meng Yang
f93ff3e5f0
Merge branch 'bugfix/btm_sec_free_dev_v6.0' into 'release/v6.0'
...
fix(bt): avoid deleting device record on partial transport cleanup (v6.0)
See merge request espressif/esp-idf!47294
2026-04-28 15:15:08 +08:00
Wang Meng Yang
068145be52
Merge branch 'bugfix/ai_review_avrcp_v6.0' into 'release/v6.0'
...
fix(bt): fix AVRCP component issues reported by AI review (v6.0)
See merge request espressif/esp-idf!47676
2026-04-28 15:14:06 +08:00
Wang Meng Yang
8b82ddcadd
Merge branch 'bugfix/spp_deinit_v6.0' into 'release/v6.0'
...
fix(bt/bluedroid): flushed all the DM PM at the end of SPP deinit (v6.0)
See merge request espressif/esp-idf!47289
2026-04-28 15:11:05 +08:00
Island
7fc3744abd
Merge branch 'change/ble_update_lib_20260409_v6.0' into 'release/v6.0'
...
change(ble): [AUTO_MR] 20260409 - Update ESP BLE Controller Lib (6.0)
See merge request espressif/esp-idf!47419
2026-04-28 14:25:25 +08:00
Island
6cf5b5f67f
Merge branch 'dev/ble-log-202603_v6.0' into 'release/v6.0'
...
dev: BLE Log 202603 (6.0)
See merge request espressif/esp-idf!47277
2026-04-28 13:25:12 +08:00
Island
4e1a423a0f
Merge branch 'feat/support_adv_monitor_for_bluedroid_host_v6.0' into 'release/v6.0'
...
feat(ble/bluedroid): support adv monitor feature (6.0)
See merge request espressif/esp-idf!47038
2026-04-28 10:26:54 +08:00
Island
29687c6d70
Merge branch 'bugfix/fix_some_bluedroid_bugs_260121_v6.0' into 'release/v6.0'
...
Bugfix/fix some bluedroid bugs 260121 (6.0)
See merge request espressif/esp-idf!46984
2026-04-28 10:26:34 +08:00
zhiweijian
3355b33b84
fix(ble/bluedroid): Fixed privacy callback triggering multiple times
2026-04-24 15:12:54 +08:00
zhiweijian
9a68172691
fix(ble/bluedroid): Fixed bluedrodi CI build error
2026-04-24 15:12:54 +08:00
zhiweijian
6444087316
fix(bt/bluedroid): Fixed AddCharacteristic failed when attr_len is zero for AUTO_RSP
2026-04-24 15:12:54 +08:00
zhiweijian
20a01bd591
disable some parameters check in CTE APIs
2026-04-24 15:12:54 +08:00
luoxu
5a697b59c9
fix(ble/bluedroid): Change BLE mesh adapter to use BTA APIs
2026-04-24 15:12:54 +08:00
zhiweijian
bc9bdd4580
fix(ble/bluedroid): optimize bluedroid host and fix GAP, memory, status and BTM API issues
...
- return HCI_ERR_MEMORY_FULL on cmd buffer alloc failure
- remove legacy adv/scan semaphores and mutex
- Use the same legacy gap callback instead of each independent legacy gap event callback
2026-04-24 15:12:54 +08:00
Zhi Wei Jian
344cc0a590
fix(ble/bluedroid): Null/range checks, crypto cleanup and API consistency
...
- smp_api.h/smp_int.h: SMP_OPCODE_ARRAY_SIZE and SecureConnectionOobDataReply
declaration alignment
- p_256_ecc_pp/p_256_multprecision: bounds and overflow fixes in ECC/multiprecision
- smp_act: init le_key; p_dev_rec null check in smp_key_distribution;
smp_compute_dhkey failure notify in smp_both_have_public_keys
- smp_api: early state/cb_evt check in SMP_SecureConnectionOobDataReply
- smp_cmac: input/length validation in cmac_aes_k_calculate and
aes_cipher_msg_auth_code
- smp_keys: smp_gen_p2_4_confirm return and smp_calculate_comfirm_cont;
smp_process_private_key/smp_compute_dhkey cleanup and peer_pub_be clear
- smp_l2c: fix callback param types with L2CAP
- smp_main: event/state bounds in smp_sm_event; smp_get_event_name default string
- smp_utils: cmd_code<SMP_OPCODE_ARRAY_SIZE and smp_cmd_build_act check;
smp_mask_enc_key/smp_command_has_invalid_parameters bounds
(cherry picked from commit 50747e4f63 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:54 +08:00
Zhi Wei Jian
38a232d1b5
fix(ble/bluedroid): BLE credit, reject when p_rcb NULL, timeout and leak fixes
...
- l2c_int: align struct/constant types with l2c_ble/l2c_main
- l2c_api: null/state checks in L2CA_SendFixedChnlData
- l2c_ble: reject when p_rcb==NULL, add L2CAP_CMD_BLE_FLOW_CTRL_CREDIT;
l2cble_init_direct_conn int64_t timeout and link_timeout==0 fix
- l2c_link: null/state checks and cleanup in hci_disc_comp/timeout/send_to_lower
- l2c_main: free p_msg on FCR non-Basic and COC branches; fix LE credit handling;
process_l2cap_cmd bounds
- l2c_utils: credit/queue cleanup and null checks in l2cu_disconnect_chnl
(cherry picked from commit 16d523e9bf )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:54 +08:00
Zhi Wei Jian
71417d530e
fix(ble/bluedroid): Fix double-free, exec write, bounds and HCI param checks
...
- gap_ble: add length/attribute checks in gap_proc_write_req
- gatt_cl: set p_cmd->p_cmd=NULL before memset to avoid double-free;
pending_cl_req %= GATT_CL_MAX_LCB
- gatt_sr: fix exec write zeroed_attrs and offset/len bounds, OOM cleanup
- gatt_sr_hash: null checks for p_attr->p_next, p_data+=2, len==0 in
gatts_calculate_datebase_hash, gatts_show_local_database
- gatt_utils: explicit return NULL, indent, idx<GATT_MAX_APPS checks,
len>GATT_MAX_ATTR_LEN, gatt_cleanup_upon_disc dealloc branch
- hciblecmds: length/handle validation in BLE ext adv/BIG sync HCI commands
(cherry picked from commit 1d31286f1a )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
c4b259b7d1
fix(ble/bluedroid): Event length checks and timer/alarm error handling
...
- btu_hcif: validate p_msg->len and hci_evt_len in process_event; pass evt_len to
sub-handlers; fix cs_subevt num_steps_reported==0 malloc; bounds in
command_complete and role_change_evt
- btu_task: handle osi_alarm_new/hash_map_set failure in btu_start_timer,
btu_start_quick_timer, btu_start_timer_oneshot
(cherry picked from commit 537661fb2e )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
b91d61ca72
fix(ble/bluedroid): BLE GAP/ACL/ISO/SCO null checks, evt_len and resource handling
...
- btm_acl: malloc/list_append failure handling, remove/memset order in btm_acl_removed
- btm_ble: remove incorrect sec_flags in SMP_OOB/NC/SC_OOB fall-through
- btm_ble_5_gap: btm_ble_hci_status_to_str unreachable return,
BTM_BleSetExtendedAdvParams/BleStartExtAdv leak and bounds
- btm_ble_addr: fix indent in btm_find_dev_by_identity_addr
- btm_ble_gap: null check p_service_data, pass evt_len to btm_ble_process_adv_pkt,
bounds in process_adv_pkt
- btm_ble_iso: align param types with declaration
- btm_ble_privacy: handle BTM_BLE_IRK_LIST_INVALID_INDEX in update_resolving_list,
comment fixes
- btm_devctl: fix btm_vsc_complete param order/type
- btm_sco: add evt_len to btm_sco_process_num_completed_pkts for bounds check
- btm_ble_int.h/btm_int.h: add evt_len to process_adv_pkt and
process_num_completed_pkts declarations
(cherry picked from commit 65b2cb2728 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
c2b8d4ec44
fix(ble/bluedroid): Add length/pointer checks and fix error paths
...
- hci_hal_h4: validate packet length and pointers in hci_packet_complete,
hdl_rx_adv_rpt, callbacks
- hci_layer: align hci_start_up error path and return; validate packet len in
filter_incoming_event
- hci_packet_factory: ensure BT_HDR length/offset initialized in make_command_no_params
- packet_fragmenter: validate length before fragment_and_dispatch
(cherry picked from commit 778dd2ab5e )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
56f1c192d1
fix(ble/bluedroid): Align config, controller indent and init error paths
...
- bt_target: remove/align obsolete macros with Kconfig
- device/controller: fix start_up() Secure Connections indent,
get_ble_resolving_list_max_size return type
- controller.h: align type/interface declarations with implementation
- bte_init: remove unused/redundant code
- bte_main: return -1 on osi_init failure, null check in bte_main_hci_send
(cherry picked from commit b83647f5ea )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
fa71c11a76
fix(ble/bluedroid): Fix init failure handling, storage/config and GATT leaks
...
- btc_main: handle bte_main_boot_entry failure with cleanup and future_ready(FUTURE_FAIL)
- btc_ble_storage: fix key/length validation in _btc_storage_get_ble_bonding_key
- btc_config: align return/error contract with callers
- btc_dm: use safe BTA_SERVICE_ID_TO_SERVICE_MASK, fix sec_cb_handler type
- btc_gatt_util: fix btc_to_bta_response/set_read_value length and bounds
- btc_gatts: future_free on early return, max_nb_attr uint16_t, fail cleanup,
handle bounds
- btc_ble_cte/btc_iso_ble: fix callback type/param consistency with BTA
(cherry picked from commit 6f5d9e3440 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
f790a1834b
fix(ble/bluedroid): Add null/range checks and fix resource handling in BTA layer
...
- bta_dm_int: fix BTA_SERVICE_ID_TO_SERVICE_MASK undefined behavior (1<<id when id>=32)
- bta_gattc_main: add event bounds check before state table lookup
- bta_gattc_utils: null checks for remote_bda/p_rcb, fix list_free in clcb_dealloc,
bta_to_btif_uuid fixes
- bta_gatts_act: fix formatting/indent in send_service_change_indication
- bta_gatts_api: validate attr_val/len, add error logs on alloc failure
- bta_sys_main: null/range checks in sm_execute, alarm/hash_map error handling in
bta_alarm_cb
(cherry picked from commit f4cec2ac4e )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
zhiweijian
7c0e0fa9c2
fix(ble/bluedroid): fix parameter validation and initialization in BLE APIs
...
- Add parameter validation in esp_gap_ble_api, esp_gattc_api, esp_gatts_api
- Initialize API args to prevent undefined behavior
- Add host status checks in API functions
- Fix memory leak if bluedroid init failed
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
9de0b82488
fix(ble/bluedroid): fix ISO HCI layer and update Kconfig
...
- Fix ISO HCI functions and remove unused code
- Fix spelling: BROCASTER to BROADCASTER in Kconfig and headers
- Update common config headers for consistency
(cherry picked from commit 611eef480a )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
b693cb7091
fix(ble/bluedroid): fix L2CAP, SMP and HCI command issues
...
- Fix active_count check in l2cu_ble_plcb_active_count
- Restore previous state if connection command fails
- Fix HCI cmd buffer size off-by-one errors
- Fix connect handle length errors
- Fix channel sounding event status handling
- Fix SMP param_len check in smp_rand_back
- Fix spelling: BROCASTER to BROADCASTER in definitions
(cherry picked from commit e118d053b3 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
b90d64d06a
fix(ble/bluedroid): fix GAP, advertising and security issues in BTM layer
...
- Fix adv state restore and reset if start/stop failed
- Fix periodic adv v2 event without PAWR feature enabled
- Fix periodic adv sync establish skip handling
- Fix resolving list max_size validation
- Fix RPA addr_type update after host-side resolution
- Fix pairing_state reset if p_dev_rec alloc failed
- Fix ISO cis_cnt limit and ext adv parameter check
- Try to delete smp keys even if not in device list
(cherry picked from commit e0ccc644a8 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
70ef058c3e
fix(ble/bluedroid): fix GATT protocol and database operation issues
...
- Fix GATTC read by type length error and rsp pdu format check
- Fix p_cur_handle update in gatts_db_read_attr_value_by_type
- Fix len calculation error in calculate_database_info_size
- Replace gatt_find_the_connected_bda with p_tcb_list iteration
- Send cmd reject if cid is invalid
- Fix param_len check in smp_rand_back
- Remove duplicate uuid compare functions
(cherry picked from commit 6242e0244c )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
b1bf55bcbe
fix(ble/bluedroid): fix parameter handling and deep copy in BTC layer
...
- Fix CS and CTE callback deep copy errors in btc_gap_ble
- Fix incorrect parameter check in btc_gattc_prepare_write_char_descr
- Fix conn_handle length error and malloc failure handling
- Fix memcpy error and reset params if malloc failed
- Fix spelling: BROCASTER to BROADCASTER
- Delete unused ISO functions in btc_iso_ble
(cherry picked from commit 1fea299dc9 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
87da89a087
fix(ble/bluedroid): fix state management and security issues in BTA DM layer
...
- Fix out-of-bounds read and peer_device cleanup in bta_dm_acl_change
- Fix adv state restore and BTM status usage in bta_dm_ble_advstop
- Fix remove security device failed due to invalid transport
- Rename tBTA_DM_API_BLE_OBSERVE to tBTA_DM_API_BLE_ADVACTION
- Remove unused btm_sec_find_bonded_dev()
(cherry picked from commit c7931bedf5 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
148a00136c
fix(ble/bluedroid): fix memory safety and state issues in BTA GATT layer
...
- Fix use-after-free and double-free in bta_gattc_update_include_service
- Fix heap buffer overflow in GATT database operations
- Fix GATTC cache load attr length check and NVS handle leak
- Fix parameter validation in bta_gattc_uuid_compare
- Ensure all CLCBs are cleaned up on deregister
- Remove unused bta_gattc_open_error
- Unify GATT db count/fill by declaration handle range
- Fix return status in gatts_set_attribute_value
(cherry picked from commit d4f3517da4 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
6fa9629fe7
fix(ble/bluedroid): fix parameter validation and cleanup in ISO and CTE APIs
...
- Add parameter validation in esp_ble_iso_api and esp_ble_cte_api
- Delete unused ISO functions and incorrect parameter checks
- Add host status check in esp_ble_iso_get_callback()
- Fix CTE parameter handling when enable value is 0
(cherry picked from commit 562cd2eae5 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:12:53 +08:00
Zhi Wei Jian
8c4c4b4140
feat(ble/bluedroid): Allow add vendor descriptor by service table create API
...
(cherry picked from commit 8207bd11e7 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:11:09 +08:00
Zhi Wei Jian
40a2253861
feat(ble/bluedroid): support adv monitor feature
...
(cherry picked from commit 1566a50929 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-04-24 15:09:41 +08:00
yangfeng
e0911c8503
fix(bt): fix AVRCP component issues reported by AI review
2026-04-23 16:05:26 +08:00
yangfeng
fb9b5f64d2
fix(bt): fix HFP api and btc component issues reported by AI review
2026-04-23 16:03:00 +08:00
yangfeng
1036ef7ac2
fix(bt): fix HFP bta component issues reported by AI review
2026-04-23 16:03:00 +08:00
Zhang Hai Peng
8c5c99f665
fix(bt/bluedroid): fix BLE SMP pairing failure on BLE-only devices when using default param
...
(cherry picked from commit 74a053bd4e )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-04-21 11:53:50 +08:00
zhaoweiliang
014c7112ea
change(ble): [AUTO_MR] Update lib_esp32c5 to c9fbba6f
2026-04-09 16:30:25 +08:00
zhaoweiliang
961a890531
change(ble): [AUTO_MR] Update lib_esp32c6 to c9fbba6f
2026-04-09 16:29:21 +08:00
zhaoweiliang
55009cc2ea
change(ble): [AUTO_MR] Update lib_esp32h2 to c9fbba6f
2026-04-09 16:28:20 +08:00
Zhao Wei Liang
675e037340
feat(ble): add adv tx options on ESP32-C5
...
(cherry picked from commit d7bfbef862 )
Co-authored-by: zhaoweiliang <zhaoweiliang@espressif.com >
2026-04-09 16:18:37 +08:00
Zhao Wei Liang
b19537d26c
feat(ble): add adv tx options on ESP32-H2
...
(cherry picked from commit 8ef46541cd )
Co-authored-by: zhaoweiliang <zhaoweiliang@espressif.com >
2026-04-09 16:18:37 +08:00
Zhao Wei Liang
dfee38ce1a
feat(ble): add adv tx options on ESP32-C6
...
(cherry picked from commit e85bb5cca8 )
Co-authored-by: zhaoweiliang <zhaoweiliang@espressif.com >
2026-04-09 16:18:36 +08:00
Jiang Jiang Jian
78822efdb0
Merge branch 'bugfix/oob_read_in_continue_packet_v6.0' into 'release/v6.0'
...
fix(bt/bluedroid): fix ACL reassembly dropping valid continuation fragments (v6.0)
See merge request espressif/esp-idf!47378
2026-04-09 14:36:57 +08:00
Jin Cheng
03c7e87202
fix(bt/bluedroid): moved L2CAP length check into start packets only
2026-04-08 20:39:55 +08:00
Jon Gilmore
051e0e671c
fix(bt/bluedroid): fix ACL reassembly dropping valid continuation fragments
...
The minimum length check in `reassemble_and_dispatch()` applied the START packet minimum (`HCI_ACL_PREAMBLE_SIZE + L2CAP_LENGTH_SIZE` = 8 bytes) to **all** ACL packets, including continuation fragments. Continuation fragments only carry the 4-byte ACL preamble (handle + length) with no L2CAP header, so small but valid continuations (5-7 bytes) were incorrectly rejected as "too short."
This caused the first L2CAP PDU in a rapid burst of BLE GATT indications to be silently dropped. The partial reassembly was orphaned, then discarded when the next indication's START fragment arrived, producing:
```
E BT_HCI: ACL packet too short (len=5)
W BT_HCI: reassemble_and_dispatch found unfinished packet for handle with start packet. Dropping old.
```
Parse the ACL preamble first (requires only 4 bytes) to determine the boundary flag, then apply the L2CAP length check only to START packets. Continuation packets are now accepted with the correct minimum of `HCI_ACL_PREAMBLE_SIZE` (4 bytes).
- ESP32-S3 connected to a BLE peripheral that fragments indications at 40 bytes per L2CAP PDU
- Peripheral sends 8+ indications within ~200ms (burst of state changes)
- The final continuation fragment of the first indication is small (5-6 bytes after type stripping)
- 100% reproducible on every burst; confirmed on ESP-IDF 5.5.3, 5.5.4, and 6.0.0
Verified on ESP32-S3 with a Sub-Zero wall oven (SO3050PESP, firmware 8.5):
- **Before fix:** First indication in every burst lost (ACL reassembly failure)
- **After fix:** All indications in burst delivered correctly, including when the final continuation fragment is 5-6 bytes
Closes https://github.com/espressif/esp-idf/issues/18414
2026-04-08 20:39:55 +08:00
zhaoweiliang
ea68016cd1
fix(ble): fixed timeout disconnect issue on ESP32-C6 and ESP32-H2
2026-04-08 11:07:10 +08:00
zhaoweiliang
f7eae67f25
fix(ble): fixed timeout disconnect issue on ESP32-C5
2026-04-08 11:02:45 +08:00