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

WNM: Use a common error path in ieee802_11_send_wnmsleep_resp()

Browse source 
Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2017-02-12 11:49:21 +02:00
parent 5fcc8c5cdf
commit e7ddd86a98
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ap/wnm_ap.c
View file

@ -95,8 +95,8 @@ static int ieee802_11_send_wnmsleep_resp(struct hostapd_data *hapd,
if (mgmt == NULL) { if (mgmt == NULL) {
wpa_printf(MSG_DEBUG, "MLME: Failed to allocate buffer for " wpa_printf(MSG_DEBUG, "MLME: Failed to allocate buffer for "
"WNM-Sleep Response action frame"); "WNM-Sleep Response action frame");
os_free(wnmtfs_ie); res = -1;
return -1; goto fail;
} }
os_memcpy(mgmt->da, addr, ETH_ALEN); os_memcpy(mgmt->da, addr, ETH_ALEN);
os_memcpy(mgmt->sa, hapd->own_addr, ETH_ALEN); os_memcpy(mgmt->sa, hapd->own_addr, ETH_ALEN);
@ -118,11 +118,8 @@ static int ieee802_11_send_wnmsleep_resp(struct hostapd_data *hapd,
(int) gtk_elem_len); (int) gtk_elem_len);
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
res = wpa_wnmsleep_igtk_subelem(sta->wpa_sm, pos); res = wpa_wnmsleep_igtk_subelem(sta->wpa_sm, pos);
if (res < 0) { if (res < 0)
os_free(wnmtfs_ie); goto fail;
os_free(mgmt);
return -1;
}
igtk_elem_len = res; igtk_elem_len = res;
pos += igtk_elem_len; pos += igtk_elem_len;
wpa_printf(MSG_DEBUG, "Pass 4 igtk_len = %d", wpa_printf(MSG_DEBUG, "Pass 4 igtk_len = %d",
@ -184,6 +181,7 @@ static int ieee802_11_send_wnmsleep_resp(struct hostapd_data *hapd,
#undef MAX_GTK_SUBELEM_LEN #undef MAX_GTK_SUBELEM_LEN
#undef MAX_IGTK_SUBELEM_LEN #undef MAX_IGTK_SUBELEM_LEN
fail:
os_free(wnmtfs_ie); os_free(wnmtfs_ie);
os_free(mgmt); os_free(mgmt);
return res; return res;