alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_null_pointer_deference_issue_4.3_mr' into 'release/v4.3'

Browse Source 
Fix the null pointer deference issue via Reconnection Spamming

See merge request espressif/esp-idf!16638
This commit is contained in:
Wang Meng Yang 2022-01-10 08:44:25 +00:00
commit 06f2f1c6b2
1 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
components/bt/host/bluedroid/stack/btm/btm_dev.c
View File

@ -314,25 +314,60 @@ BOOLEAN btm_find_sec_dev_in_list (void *p_node_data, void *context)
tBTM_SEC_DEV_REC *btm_sec_alloc_dev (BD_ADDR bd_addr) tBTM_SEC_DEV_REC *btm_sec_alloc_dev (BD_ADDR bd_addr)
{ {
tBTM_SEC_DEV_REC *p_dev_rec = NULL; tBTM_SEC_DEV_REC *p_dev_rec = NULL;
tBTM_SEC_DEV_REC *p_dev_new_rec = NULL;
tBTM_SEC_DEV_REC *p_dev_old_rec = NULL;
tBTM_INQ_INFO *p_inq_info; tBTM_INQ_INFO *p_inq_info;
list_node_t *p_node = NULL;
BOOLEAN new_entry_found = FALSE;
BOOLEAN old_entry_found = FALSE;
BOOLEAN malloc_new_entry = FALSE;
BTM_TRACE_EVENT ("btm_sec_alloc_dev\n"); BTM_TRACE_EVENT ("btm_sec_alloc_dev\n");
for (p_node = list_begin(btm_cb.p_sec_dev_rec_list); p_node; p_node = list_next(p_node)) {
/* Old devices which are not in use are deleted already */ p_dev_old_rec = list_node(p_node);
/* Allocate new device or reuse the oldest device */ /* look for old entry which match the bd_addr and the BTM_SEC_IN_USE is cleared */
if (list_length(btm_cb.p_sec_dev_rec_list) < BTM_SEC_MAX_DEVICE_RECORDS) { if (!(p_dev_old_rec->sec_flags & BTM_SEC_IN_USE) &&
//Max number of devices is not exceeded, allocate new device (!memcmp (p_dev_old_rec->bd_addr, bd_addr, BD_ADDR_LEN))) {
p_dev_rec = (tBTM_SEC_DEV_REC *)osi_malloc(sizeof(tBTM_SEC_DEV_REC)); old_entry_found = TRUE;
if (p_dev_rec) { BTM_TRACE_EVENT ("btm_sec_alloc_dev old device found\n");
list_append(btm_cb.p_sec_dev_rec_list, p_dev_rec); break;
} else {
return NULL;
} }
} }
else { for (p_node = list_begin(btm_cb.p_sec_dev_rec_list); p_node; p_node = list_next(p_node)) {
//Find and reuse the oldest device p_dev_new_rec = list_node(p_node);
p_dev_rec = btm_find_oldest_dev(); /* find the first entry whose BTM_SEC_IN_USE is cleared */
if (!(p_dev_new_rec->sec_flags & BTM_SEC_IN_USE)) {
new_entry_found = TRUE;
break;
}
}
if (!new_entry_found) {
/* We can not find new device. We need malloc a new one if p_sec_dev_rec_list is not full */
if (list_length(btm_cb.p_sec_dev_rec_list) < BTM_SEC_MAX_DEVICE_RECORDS){
p_dev_new_rec = (tBTM_SEC_DEV_REC *)osi_malloc(sizeof(tBTM_SEC_DEV_REC));
if (p_dev_new_rec) {
new_entry_found = TRUE;
malloc_new_entry = TRUE;
} else {
return NULL;
}
}
}
if (!new_entry_found) {
p_dev_rec = btm_find_oldest_dev();
} else {
/* if the old device entry not present go with new entry */
if (old_entry_found) {
p_dev_rec = p_dev_old_rec;
if (malloc_new_entry) {
osi_free(p_dev_new_rec);
}
} else {
if (malloc_new_entry) {
list_append(btm_cb.p_sec_dev_rec_list, p_dev_new_rec);
}
p_dev_rec = p_dev_new_rec;
}
} }
memset (p_dev_rec, 0, sizeof (tBTM_SEC_DEV_REC)); memset (p_dev_rec, 0, sizeof (tBTM_SEC_DEV_REC));
p_dev_rec->bond_type = BOND_TYPE_UNKNOWN; /* Default value */ p_dev_rec->bond_type = BOND_TYPE_UNKNOWN; /* Default value */