luoxu
fb6593f438
fix(ble/bluedroid): Change BLE mesh adapter to use BTA APIs
2026-03-30 10:50:53 +08:00
zhiweijian
0bd4c9a5ad
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-03-30 10:49:26 +08:00
Zhi Wei Jian
35ba73a021
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-03-30 10:49:11 +08:00
Zhi Wei Jian
64987b1cdd
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-03-30 10:47:35 +08:00
Zhi Wei Jian
f2e06ca905
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-03-25 13:58:37 +08:00
Zhi Wei Jian
4bf1770901
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-03-25 13:58:37 +08:00
Zhi Wei Jian
695be6cff2
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-03-25 13:58:36 +08:00
Zhi Wei Jian
c03a27565c
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-03-25 13:58:36 +08:00
Zhi Wei Jian
82782f853c
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-03-25 13:58:36 +08:00
Zhi Wei Jian
7c4386f921
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-03-25 13:58:35 +08:00
Zhi Wei Jian
875cd29be3
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-03-25 13:58:35 +08:00
Zhi Wei Jian
8ffd600d34
fix(ble/bluedroid): fix bugs in BLE 5.0 bluedroid examples
...
- Fix callback function usage and parameter errors
- Fix spelling: BROCASTER to BROADCASTER in examples
- Update examples to match API changes
(cherry picked from commit 8f4dd7824e )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-03-25 10:27:36 +08:00
Zhi Wei Jian
dceb615b10
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-03-25 10:27:35 +08:00
Zhi Wei Jian
f34c9d5b73
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-03-25 10:27:35 +08:00
Zhi Wei Jian
9cebea1dba
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-03-25 10:27:34 +08:00
Zhi Wei Jian
f2f62587d6
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-03-25 10:27:34 +08:00
Zhi Wei Jian
a4fe9d2aae
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-03-25 10:27:34 +08:00
Zhi Wei Jian
112595e5a6
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-03-25 10:27:33 +08:00
Zhi Wei Jian
225953798c
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-03-25 10:27:33 +08:00
Zhi Wei Jian
b03b29e0bd
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-03-25 10:27:33 +08:00
Zhi Wei Jian
b0080fca3f
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
(cherry picked from commit d439a3fcce )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-03-25 10:27:32 +08:00
Jiang Jiang Jian
a7d6fb261d
Merge branch 'fix/fix_phy_update_failure_on_c2_5.4' into 'release/v5.4'
...
fix(ble): fix conn timeout after phy update on ESP32-C2
See merge request espressif/esp-idf!46752
2026-03-21 14:24:34 +08:00
cjin
bc60ae40dd
fix(ble): fix conn timeout after phy update on ESP32-C2
2026-03-19 09:51:51 +08:00
Jiang Jiang Jian
fe2cc0a64c
Merge branch 'fix/usj_fifo_bug_v5.4' into 'release/v5.4'
...
fix(usj):Fix usj fifo write/read on p4 (backport v5.4)
See merge request espressif/esp-idf!46638
2026-03-17 11:48:04 +08:00
Jiang Jiang Jian
5dc27530cc
Merge branch 'feat/bt_distance_test_v5.4' into 'release/v5.4'
...
feat(bt): Add APIs to read ACL real RSSI and read/write tx power of inq/iscan/page/pscan/ACL (v5.4)
See merge request espressif/esp-idf!46646
2026-03-17 11:14:50 +08:00
Jiang Jiang Jian
25a017a9d7
Merge branch 'feature/update_gdbstub_v5.4' into 'release/v5.4'
...
gdbstub: backport fixes (v5.4)
See merge request espressif/esp-idf!46581
2026-03-17 10:56:55 +08:00
Jiang Jiang Jian
b16c368b3c
Merge branch 'bugfix/fix_call_spp_start_discovert_twice_crash_v5.4' into 'release/v5.4'
...
fix(bt): fix crash when calling esp_spp_start_discovery twice in succession(v5.4)
See merge request espressif/esp-idf!46666
2026-03-17 10:13:27 +08:00
morris
6e907ccdbc
Merge branch 'bugfix/fix_legacy_touch_driver_stuck_after_dsleep_v5.4' into 'release/v5.4'
...
fix(legacy_touch): fixed the read stuck issue after deep sleep (v5.4)
See merge request espressif/esp-idf!46011
2026-03-17 10:11:22 +08:00
Jiang Jiang Jian
d6e5d76f66
Merge branch 'contrib/github_pr_18310_v5.4' into 'release/v5.4'
...
fix(esp_http_server): Dispatch PONG frames to WebSocket handler (GitHub PR) (v5.4)
See merge request espressif/esp-idf!46657
2026-03-17 09:23:52 +08:00
Jiang Jiang Jian
658e24e40f
Merge branch 'feat/support_wifi_infinite_retry_v5.4' into 'release/v5.4'
...
feat(protocol_examples_common): support infinite retries for example_handler_on_wifi_disconnect (v5.4)
See merge request espressif/esp-idf!46671
2026-03-17 09:22:12 +08:00
Jiang Jiang Jian
bdc4dc5e9e
Merge branch 'feat/expand_periph_skip_ls_no_to_v5.4' into 'release/v5.4'
...
fix(pm): expand the number of skip light sleep number
See merge request espressif/esp-idf!46625
2026-03-17 09:17:24 +08:00
Alexey Gerenkov
6ea0fe1c15
Merge branch 'feature/update-openocd-to-v0.12.0-esp32-20260304_v5.4' into 'release/v5.4'
...
feat(tools): update openocd version to v0.12.0-esp32-20260304 (v5.4)
See merge request espressif/esp-idf!46365
2026-03-16 20:26:43 +08:00
Tan Yan Quan
969969ec36
feat(protocol_examples_common): support infinite retries for example_handler_on_wifi_disconnect
2026-03-16 19:49:30 +08:00
xiongweichao
76652f73bd
fix(bt): fix crash when calling esp_spp_start_discovery twice in succession
2026-03-16 19:40:29 +08:00
Jiang Jiang Jian
9e7abc9f01
Merge branch 'feat/p4_eco5_ccm_v5.4' into 'release/v5.4'
...
ISP: support ccm on P4 eco5 (v5.4)
See merge request espressif/esp-idf!44813
2026-03-16 19:23:57 +08:00
Jiang Jiang Jian
48b82d0690
Merge branch 'contrib/github_pr_16130_v5.4' into 'release/v5.4'
...
esp_adc: Release the peripheral after calibration (GitHub PR) (v5.4)
See merge request espressif/esp-idf!40002
2026-03-16 19:22:01 +08:00
Jiang Jiang Jian
165aff222d
Merge branch 'fix/esp32_adc_continuous_loss_sample_v5.4' into 'release/v5.4'
...
Fix/esp32 adc continuous loss sample (v5.4)
See merge request espressif/esp-idf!42830
2026-03-16 19:19:42 +08:00
Jiang Jiang Jian
00b61e28f2
Merge branch 'fix/adc_c6_get_high_result_v5.4' into 'release/v5.4'
...
fix(adc): fix ESP32C6 ADC get high result after enable (v5.4)
See merge request espressif/esp-idf!43229
2026-03-16 19:18:38 +08:00
Jiang Jiang Jian
500963afc5
Merge branch 'bugfix/fix_some_wifi_bugs_260313_v5.4' into 'release/v5.4'
...
fix(wifi): fix some wifi bugs 260313 v5.4(Backport v5.4)
See merge request espressif/esp-idf!46615
2026-03-16 19:18:09 +08:00
Ashish Sharma
e08f079ce3
feat(http_server): adds example to test server pong response
2026-03-16 16:56:13 +08:00
Peter Backeris
3d0e26170d
fix(esp_http_server): Dispatch PONG frames to WebSocket handler
...
PONG frames (opcode 0xA) were never dispatched to the user's WebSocket
handler despite an existing comment stating they should be. The dispatch
condition `ra->ws_type < HTTPD_WS_TYPE_CLOSE` excluded PONG (0xA)
since CLOSE is 0x8.
This caused a critical secondary bug: when the server sends PING frames
and the client responds with PONG, httpd_ws_recv_frame() is never
called for the PONG, leaving the remaining frame bytes (second_byte
plus 4-byte mask_key) unconsumed in the TCP buffer. On the next
WebSocket read, these orphaned bytes are misinterpreted as a new frame
header, causing either "WS frame is not properly masked" errors or
EAGAIN timeouts with garbage length values, effectively destroying
the connection.
Add `ra->ws_type == HTTPD_WS_TYPE_PONG` to the dispatch condition so
PONG frames reach the user handler, which calls httpd_ws_recv_frame()
to properly consume the frame bytes from the socket.
Closes https://github.com/espressif/esp-idf/issues/18227
2026-03-16 16:56:13 +08:00
Alexey Lapshin
2eebcf27c6
fix(esp_gdbstub): adapt xtensa headers
2026-03-16 15:17:34 +07:00
yangfeng
23a7b191ca
feat(bt): Add APIs to control transmit power level
...
- API to read ACL real RSSI
- APIs to read/write tx power of inq/iscan/page/pscan/ACL
2026-03-16 15:45:51 +08:00
laokaiyao
732ee2ddc8
fix(legacy_touch): fixed the read stuck issue after deep sleep
2026-03-16 15:26:47 +08:00
C.S.M
4bb47f5145
fix(usj):Fix usj fifo write/read on p4
2026-03-16 15:22:15 +08:00
Jiang Jiang Jian
4193d214e3
Merge branch 'bugfix/report_hid_close_evt_v5.4' into 'release/v5.4'
...
fix(hid): Fixed HID repeatedly reporting the close event (v5.4)
See merge request espressif/esp-idf!46612
2026-03-16 14:45:20 +08:00
Jiang Jiang Jian
c6ba36d69f
Merge branch 'bugfix/pm-673_v5.4' into 'release/v5.4'
...
backport v5.4: fix analog i2c master race cause by phy retention link
See merge request espressif/esp-idf!46437
2026-03-16 11:51:58 +08:00
Jiang Jiang Jian
0300db2e32
Merge branch 'fix/adc_continuous_iram_config_v5.4' into 'release/v5.4'
...
fix(adc): fix ESP32/S2 panic when use continuous ADC (v5.4)
See merge request espressif/esp-idf!43640
2026-03-16 11:02:50 +08:00
cjin
1c000d02bc
fix(pm): expand the number of skip light sleep number
2026-03-16 08:56:55 +08:00
yangfeng
01fb000eb6
fix(hid): Fixed HID repeatedly reporting the close event
2026-03-15 13:13:12 +08:00