Merge branch 'bugfix/fix_some_ble_bugs_240310_v5.1' into 'release/v5.1'

Bugfix/fix some ble bugs 240310 v5.1(backport v5.1) See merge request espressif/esp-idf!29518
espressif · Mar 12, 2024 · b0fb3bb · b0fb3bb
2 parents 635ab30 + 672775b
commit b0fb3bb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c
@@ -612,6 +612,11 @@ void bta_dm_disable (tBTA_DM_MSG *p_data)
     btm_ble_resolving_list_cleanup ();  //by TH, because cmn_ble_vsc_cb.max_filter has something mistake as btm_ble_adv_filter_cleanup
 #endif
 
+#if BLE_INCLUDED == TRUE
+    // btm_ble_multi_adv_init is called when the host is enabled, so btm_ble_multi_adv_cleanup is called when the host is disabled.
+    btm_ble_multi_adv_cleanup();
+#endif
+
 }
 
 /*******************************************************************************

diff --git a/components/bt/host/bluedroid/bta/dm/bta_dm_api.c b/components/bt/host/bluedroid/bta/dm/bta_dm_api.c
@@ -2795,7 +2795,6 @@ void BTA_VendorCleanup (void)
     }
 #endif
 
-    btm_ble_multi_adv_cleanup();
 }
 #if (BLE_50_FEATURE_SUPPORT == TRUE)
 void BTA_DmBleGapReadPHY(BD_ADDR addr)

diff --git a/components/bt/host/bluedroid/stack/btm/btm_ble_5_gap.c b/components/bt/host/bluedroid/stack/btm/btm_ble_5_gap.c
@@ -796,8 +796,13 @@ tBTM_STATUS BTM_BlePeriodicAdvCreateSync(tBTM_BLE_Periodic_Sync_Params *params)
         || (params->reports_disabled > 0x01)
         || (params->filter_duplicates > 0x01)
         #endif
-        || (params->addr_type > 0x01) ||
-        (params->sid > 0xf) || (params->skip > 0x01F3)) {
+        /*If the Periodic Advertiser List is not used,
+        the Advertising_SID, Advertiser Address_Type, and Advertiser Address
+        parameters specify the periodic advertising device to listen to; otherwise they
+        shall be ignored.*/
+        || (params->filter_policy == 0 && params->addr_type > 0x01)
+        || (params->filter_policy == 0 && params->sid > 0xf)
+        || (params->skip > 0x01F3)) {
             status = BTM_ILLEGAL_VALUE;
             BTM_TRACE_ERROR("%s, The sync parameters is invalid.", __func__);
             goto end;

diff --git a/components/bt/host/bluedroid/stack/btm/btm_ble_multi_adv.c b/components/bt/host/bluedroid/stack/btm/btm_ble_multi_adv.c
@@ -824,6 +824,13 @@ void btm_ble_multi_adv_init(void)
 *******************************************************************************/
 void btm_ble_multi_adv_cleanup(void)
 {
+#if BTM_DYNAMIC_MEMORY == TRUE
+    if (btm_multi_adv_cb_ptr == NULL)
+    {
+        BTM_TRACE_WARNING("%s memory has been freed", __func__);
+        return;
+    }
+#endif
     if (btm_multi_adv_cb.p_adv_inst) {
         osi_free(btm_multi_adv_cb.p_adv_inst);
         btm_multi_adv_cb.p_adv_inst = NULL;