A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Fix RNR entry list access error

Browse source 
Failed to read RNR entries from the RNR list
while issuing the scan.

Arguments passed to access the next node from RNR list
is not initalized due to which RNR entry accessing failed.

Change-Id: If5d1f4cace8e393e93b82ac3881b9627bde5f9e1
CRs-Fixed: 2605732
This commit is contained in:
Sandeep Puligilla 2020-01-21 01:19:21 -08:00 • committed by nshrivas
commit f6485c72bb
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
umac/scan/core/src/wlan_scan_cache_db.c
View file

@ -184,7 +184,6 @@ static void scm_del_rnr_channel_db(struct scan_cache_entry *entry)
chan_freq);
return;
}
channel->bss_beacon_probe_count--;
cur_node = NULL;
qdf_list_peek_front(&channel->rnr_list, &cur_node);
/* Free the Node */
@ -200,11 +199,15 @@ static void scm_del_rnr_channel_db(struct scan_cache_entry *entry)
qdf_list_remove_node(&channel->rnr_list,
&rnr_node->node);
qdf_mem_free(rnr_node);
channel->bss_beacon_probe_count--;
break;
} else if (rnr_node->entry.short_ssid ==
rnr_bss->short_ssid) {
qdf_list_remove_node(&channel->rnr_list,
&rnr_node->node);
qdf_mem_free(rnr_node);
channel->bss_beacon_probe_count--;
break;
}
cur_node = next_node;
next_node = NULL;

13
umac/scan/core/src/wlan_scan_manager.c
View file

@ -998,9 +998,10 @@ static void scm_update_rnr_info(struct scan_start_request *req)
uint8_t total_count = MAX_HINTS_PER_SCAN_REQ;
uint32_t freq;
struct meta_rnr_channel *chan;
qdf_list_node_t *cur_node, *next_node;
qdf_list_node_t *cur_node, *next_node = NULL;
struct scan_rnr_node *rnr_node;
struct chan_list *chan_list;
QDF_STATUS status;
if (!req)
return;
@ -1012,13 +1013,15 @@ static void scm_update_rnr_info(struct scan_start_request *req)
continue;
chan = scm_get_chan_meta(freq);
if (!chan) {
scm_debug("Failed to get meta, freq %d", freq);
continue;
}
if (qdf_list_empty(&chan->rnr_list))
continue;
qdf_list_peek_front(&chan->rnr_list, &cur_node);
while (cur_node && total_count) {
qdf_list_peek_next(&chan->rnr_list, cur_node,
&next_node);
rnr_node = qdf_container_of(cur_node,
struct scan_rnr_node,
node);
@ -1034,6 +1037,10 @@ static void scm_update_rnr_info(struct scan_start_request *req)
req->scan_req.num_hint_s_ssid++;
total_count--;
}
status = qdf_list_peek_next(&chan->rnr_list, cur_node,
&next_node);
if (QDF_IS_STATUS_ERROR(status))
break;
cur_node = next_node;
next_node = NULL;
}