Merge branch 'bugfix/delete_node_during_list_traverse_4.3' into 'rele…

…ase/v4.3' bugfix: Fixed the crash of LoadProhibited caused by invalid operation on list node in handling hci_hardware_error event (v4.3) See merge request espressif/esp-idf!23119
espressif · Apr 11, 2023 · 6a7c559 · 6a7c559
2 parents 1b31873 + df161ee
commit 6a7c559
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/components/bt/host/bluedroid/stack/btm/btm_acl.c b/components/bt/host/bluedroid/stack/btm/btm_acl.c
@@ -509,12 +509,14 @@ void btm_acl_device_down (void)
 {
     tACL_CONN   *p = NULL;
     BTM_TRACE_DEBUG ("btm_acl_device_down\n");
-    for (list_node_t *p_node = list_begin(btm_cb.p_acl_db_list); p_node; p_node = list_next(p_node)) {
-       p = list_node(p_node);
-       if (p && p->in_use) {
-           BTM_TRACE_DEBUG ("hci_handle=%d HCI_ERR_HW_FAILURE \n", p->hci_handle );
-           l2c_link_hci_disc_comp (p->hci_handle, HCI_ERR_HW_FAILURE);
-       }
+    for (list_node_t *p_node = list_begin(btm_cb.p_acl_db_list); p_node;) {
+        list_node_t *p_next = list_next(p_node);
+        p = list_node(p_node);
+        if (p && p->in_use) {
+            BTM_TRACE_DEBUG ("hci_handle=%d HCI_ERR_HW_FAILURE \n", p->hci_handle );
+            l2c_link_hci_disc_comp (p->hci_handle, HCI_ERR_HW_FAILURE);
+        }
+        p_node = p_next;
    }
 }
 /*******************************************************************************