DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Check for NULL qsort() base pointers

Browse source 
There are a couple of places in wpa_supplicant/hostapd where qsort() can
be called with a NULL base pointer. This results in undefined behavior
according to the C standard and with some standard C libraries (ARM RVCT
2.2) results in a data abort/memory exception. Fix this by skipping such
calls since there is nothing needing to be sorted.

Signed-off-by: Joel Cunningham <joel.cunningham@me.com>
This commit is contained in:
Joel Cunningham 2016-10-08 12:04:15 -05:00 committed by Jouni Malinen
parent 74b23fafe9
commit 33111c910b
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hostapd/config_file.c
View file

@ -208,7 +208,8 @@ static int hostapd_config_read_maclist(const char *fname,
fclose(f); fclose(f);
qsort(*acl, *num, sizeof(**acl), hostapd_acl_comp); if (*acl)
qsort(*acl, *num, sizeof(**acl), hostapd_acl_comp);
return 0; return 0;
} }

6
wpa_supplicant/scan.c
View file

@ -2177,8 +2177,10 @@ wpa_supplicant_get_scan_results(struct wpa_supplicant *wpa_s,
} }
#endif /* CONFIG_WPS */ #endif /* CONFIG_WPS */
qsort(scan_res->res, scan_res->num, sizeof(struct wpa_scan_res *), if (scan_res->res) {
compar); qsort(scan_res->res, scan_res->num,
sizeof(struct wpa_scan_res *), compar);
}
dump_scan_res(scan_res); dump_scan_res(scan_res);
wpa_bss_update_start(wpa_s); wpa_bss_update_start(wpa_s);