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

Interworking: Fix SIM/USIM NAI construction

Browse source 
Commit 9914c96feb moved sizeof(nai) to a
helper function and broke the determination of maximum buffer length.
Fix this by moving the sizeof() to the functions that define the buffer.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-02-19 14:24:45 +02:00
parent 974c56ac24
commit d8e59feab2
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wpa_supplicant/interworking.c
View file

@ -507,7 +507,8 @@ static int plmn_id_match(struct wpabuf *anqp, const char *imsi)
} }
static int build_root_nai(char *nai, const char *imsi, char prefix) static int build_root_nai(char *nai, size_t nai_len, const char *imsi,
char prefix)
{ {
const char *sep, *msin; const char *sep, *msin;
char *end, *pos; char *end, *pos;
@ -534,7 +535,7 @@ static int build_root_nai(char *nai, const char *imsi, char prefix)
msin_len = os_strlen(msin); msin_len = os_strlen(msin);
pos = nai; pos = nai;
end = pos + sizeof(nai); end = nai + nai_len;
if (prefix) if (prefix)
*pos++ = prefix; *pos++ = prefix;
os_memcpy(pos, imsi, plmn_len); os_memcpy(pos, imsi, plmn_len);
@ -561,7 +562,7 @@ static int build_root_nai(char *nai, const char *imsi, char prefix)
static int set_root_nai(struct wpa_ssid *ssid, const char *imsi, char prefix) static int set_root_nai(struct wpa_ssid *ssid, const char *imsi, char prefix)
{ {
char nai[100]; char nai[100];
if (build_root_nai(nai, imsi, prefix) < 0) if (build_root_nai(nai, sizeof(nai), imsi, prefix) < 0)
return -1; return -1;
return wpa_config_set_quoted(ssid, "identity", nai); return wpa_config_set_quoted(ssid, "identity", nai);
} }
@ -949,7 +950,7 @@ static int interworking_home_sp(struct wpa_supplicant *wpa_s,
for (cred = wpa_s->conf->cred; cred; cred = cred->next) { for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
#ifdef INTERWORKING_3GPP #ifdef INTERWORKING_3GPP
if (cred->imsi && if (cred->imsi &&
build_root_nai(nai, cred->imsi, 0) == 0) { build_root_nai(nai, sizeof(nai), cred->imsi, 0) == 0) {
realm = os_strchr(nai, '@'); realm = os_strchr(nai, '@');
if (realm) if (realm)
realm++; realm++;