jeltz
/
hostap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dbus: Verify WPA/RSN IE parser result before returning data

This commit is contained in:
Jouni Malinen 2010-09-04 22:01:29 +03:00
parent 7f5420691e
commit af3e1b0ec2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wpa_supplicant/dbus/dbus_new_handlers.c
View File

@ -2726,8 +2726,11 @@ DBusMessage * wpas_dbus_getter_bss_wpa(DBusMessage *message,
os_memset(&wpa_data, 0, sizeof(wpa_data));
ie = wpa_bss_get_vendor_ie(res, WPA_IE_VENDOR_TYPE);
if (ie)
wpa_parse_wpa_ie(ie, 2 + ie[1], &wpa_data);
if (ie) {
if (wpa_parse_wpa_ie(ie, 2 + ie[1], &wpa_data) < 0)
return wpas_dbus_error_unknown_error(message,
"invalid WPA IE");
}
return wpas_dbus_get_bss_security_prop(message, &wpa_data);
}
@ -2756,8 +2759,11 @@ DBusMessage * wpas_dbus_getter_bss_rsn(DBusMessage *message,
os_memset(&wpa_data, 0, sizeof(wpa_data));
ie = wpa_bss_get_ie(res, WLAN_EID_RSN);
if (ie)
wpa_parse_wpa_ie(ie, 2 + ie[1], &wpa_data);
if (ie) {
if (wpa_parse_wpa_ie(ie, 2 + ie[1], &wpa_data) < 0)
return wpas_dbus_error_unknown_error(message,
"invalid RSN IE");
}
return wpas_dbus_get_bss_security_prop(message, &wpa_data);
}