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

tests: Validate hwaddr/hexstr input to DRIVER_EVENT SCAN_RES

Browse source 
To be more consistent with existing hwaddr_aton() and hexstr2bin()
callers, check the return values in this test command.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2017-02-05 16:31:03 +02:00
parent 275cc94280
commit 1fb4437c80
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
wpa_supplicant/ctrl_iface.c
View file

@ -8045,6 +8045,7 @@ static int wpas_ctrl_iface_driver_scan_res(struct wpa_supplicant *wpa_s,
struct wpa_scan_res *res; struct wpa_scan_res *res;
struct os_reltime now; struct os_reltime now;
char *pos, *end; char *pos, *end;
int ret = -1;
if (!param) if (!param)
return -1; return -1;
@ -8072,8 +8073,8 @@ static int wpas_ctrl_iface_driver_scan_res(struct wpa_supplicant *wpa_s,
res->flags = strtol(pos + 7, NULL, 16); res->flags = strtol(pos + 7, NULL, 16);
pos = os_strstr(param, " bssid="); pos = os_strstr(param, " bssid=");
if (pos) if (pos && hwaddr_aton(pos + 7, res->bssid))
hwaddr_aton(pos + 7, res->bssid); goto fail;
pos = os_strstr(param, " freq="); pos = os_strstr(param, " freq=");
if (pos) if (pos)
@ -8120,8 +8121,8 @@ static int wpas_ctrl_iface_driver_scan_res(struct wpa_supplicant *wpa_s,
res->parent_tsf = strtoll(pos + 7, NULL, 16); res->parent_tsf = strtoll(pos + 7, NULL, 16);
pos = os_strstr(param, " tsf_bssid="); pos = os_strstr(param, " tsf_bssid=");
if (pos) if (pos && hwaddr_aton(pos + 11, res->tsf_bssid))
hwaddr_aton(pos + 11, res->tsf_bssid); goto fail;
pos = os_strstr(param, " ie="); pos = os_strstr(param, " ie=");
if (pos) { if (pos) {
@ -8130,7 +8131,8 @@ static int wpas_ctrl_iface_driver_scan_res(struct wpa_supplicant *wpa_s,
if (!end) if (!end)
end = pos + os_strlen(pos); end = pos + os_strlen(pos);
res->ie_len = (end - pos) / 2; res->ie_len = (end - pos) / 2;
hexstr2bin(pos, (u8 *) (res + 1), res->ie_len); if (hexstr2bin(pos, (u8 *) (res + 1), res->ie_len))
goto fail;
} }
pos = os_strstr(param, " beacon_ie="); pos = os_strstr(param, " beacon_ie=");
@ -8140,15 +8142,18 @@ static int wpas_ctrl_iface_driver_scan_res(struct wpa_supplicant *wpa_s,
if (!end) if (!end)
end = pos + os_strlen(pos); end = pos + os_strlen(pos);
res->beacon_ie_len = (end - pos) / 2; res->beacon_ie_len = (end - pos) / 2;
hexstr2bin(pos, ((u8 *) (res + 1)) + res->ie_len, if (hexstr2bin(pos, ((u8 *) (res + 1)) + res->ie_len,
res->beacon_ie_len); res->beacon_ie_len))
goto fail;
} }
os_get_reltime(&now); os_get_reltime(&now);
wpa_bss_update_scan_res(wpa_s, res, &now); wpa_bss_update_scan_res(wpa_s, res, &now);
ret = 0;
fail:
os_free(res); os_free(res);
return 0; return ret;
} }