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

HS 2.0: Fix sp_type check in ctrl_iface status command

Browse source 
Commit e99b4f3a14 added functionality to
check whether the current association is with the home SP. This commit
did not take into account that the domain name ANQP information could be
NULL and that could result to a NULL pointer dereference. Fix that by
validation that domain_names != NULL before calling
domain_name_list_contains().

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2012-12-17 12:12:13 +02:00 committed by Jouni Malinen
parent 0a66ce3c49
commit 953d25ca5f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wpa_supplicant/interworking.c
View file

@ -1490,7 +1490,8 @@ int interworking_home_sp_cred(struct wpa_supplicant *wpa_s,
mnc_len = wpa_s->mnc_len; mnc_len = wpa_s->mnc_len;
} }
#endif /* CONFIG_PCSC */ #endif /* CONFIG_PCSC */
if (imsi && build_root_nai(nai, sizeof(nai), imsi, mnc_len, 0) == 0) { if (domain_names &&
imsi && build_root_nai(nai, sizeof(nai), imsi, mnc_len, 0) == 0) {
realm = os_strchr(nai, '@'); realm = os_strchr(nai, '@');
if (realm) if (realm)
realm++; realm++;
@ -1502,7 +1503,7 @@ int interworking_home_sp_cred(struct wpa_supplicant *wpa_s,
} }
#endif /* INTERWORKING_3GPP */ #endif /* INTERWORKING_3GPP */
if (cred->domain == NULL) if (domain_names == NULL || cred->domain == NULL)
return 0; return 0;
wpa_printf(MSG_DEBUG, "Interworking: Search for match with " wpa_printf(MSG_DEBUG, "Interworking: Search for match with "