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

nl80211: Fix nl_mgmt handling in partial error case

Browse source 
If Action frame registration in nl80211_mgmt_subscribe_non_ap() failed
for any frame type, the previous implementation skipped
nl80211_mgmt_handle_register_eloop() call. This is not desirable since
none of the Action frame types could be received and even worse, the
following nl80211_destroy_eloop_handle() call for nl_mgmt would likely
result in crashing the process due to the ELOOP_SOCKET_INVALID XOR
operation. This could be triggered at least in a P2P group interface
startup failure case.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-12-31 10:17:53 +02:00
parent 4ea6a47133
commit 6f06766e71
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/drivers/driver_nl80211.c
View file

@ -4050,6 +4050,7 @@ static int nl80211_register_action_frame(struct i802_bss *bss,
static int nl80211_mgmt_subscribe_non_ap(struct i802_bss *bss) static int nl80211_mgmt_subscribe_non_ap(struct i802_bss *bss)
{ {
struct wpa_driver_nl80211_data *drv = bss->drv; struct wpa_driver_nl80211_data *drv = bss->drv;
int ret = 0;
if (nl80211_alloc_mgmt_handle(bss)) if (nl80211_alloc_mgmt_handle(bss))
return -1; return -1;
@ -4066,65 +4067,65 @@ static int nl80211_mgmt_subscribe_non_ap(struct i802_bss *bss)
#ifdef CONFIG_INTERWORKING #ifdef CONFIG_INTERWORKING
/* QoS Map Configure */ /* QoS Map Configure */
if (nl80211_register_action_frame(bss, (u8 *) "\x01\x04", 2) < 0) if (nl80211_register_action_frame(bss, (u8 *) "\x01\x04", 2) < 0)
return -1; ret = -1;
#endif /* CONFIG_INTERWORKING */ #endif /* CONFIG_INTERWORKING */
#if defined(CONFIG_P2P) || defined(CONFIG_INTERWORKING) #if defined(CONFIG_P2P) || defined(CONFIG_INTERWORKING)
/* GAS Initial Request */ /* GAS Initial Request */
if (nl80211_register_action_frame(bss, (u8 *) "\x04\x0a", 2) < 0) if (nl80211_register_action_frame(bss, (u8 *) "\x04\x0a", 2) < 0)
return -1; ret = -1;
/* GAS Initial Response */ /* GAS Initial Response */
if (nl80211_register_action_frame(bss, (u8 *) "\x04\x0b", 2) < 0) if (nl80211_register_action_frame(bss, (u8 *) "\x04\x0b", 2) < 0)
return -1; ret = -1;
/* GAS Comeback Request */ /* GAS Comeback Request */
if (nl80211_register_action_frame(bss, (u8 *) "\x04\x0c", 2) < 0) if (nl80211_register_action_frame(bss, (u8 *) "\x04\x0c", 2) < 0)
return -1; ret = -1;
/* GAS Comeback Response */ /* GAS Comeback Response */
if (nl80211_register_action_frame(bss, (u8 *) "\x04\x0d", 2) < 0) if (nl80211_register_action_frame(bss, (u8 *) "\x04\x0d", 2) < 0)
return -1; ret = -1;
#endif /* CONFIG_P2P || CONFIG_INTERWORKING */ #endif /* CONFIG_P2P || CONFIG_INTERWORKING */
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
/* P2P Public Action */ /* P2P Public Action */
if (nl80211_register_action_frame(bss, if (nl80211_register_action_frame(bss,
(u8 *) "\x04\x09\x50\x6f\x9a\x09", (u8 *) "\x04\x09\x50\x6f\x9a\x09",
6) < 0) 6) < 0)
return -1; ret = -1;
/* P2P Action */ /* P2P Action */
if (nl80211_register_action_frame(bss, if (nl80211_register_action_frame(bss,
(u8 *) "\x7f\x50\x6f\x9a\x09", (u8 *) "\x7f\x50\x6f\x9a\x09",
5) < 0) 5) < 0)
return -1; ret = -1;
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
/* SA Query Response */ /* SA Query Response */
if (nl80211_register_action_frame(bss, (u8 *) "\x08\x01", 2) < 0) if (nl80211_register_action_frame(bss, (u8 *) "\x08\x01", 2) < 0)
return -1; ret = -1;
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
if ((drv->capa.flags & WPA_DRIVER_FLAGS_TDLS_SUPPORT)) { if ((drv->capa.flags & WPA_DRIVER_FLAGS_TDLS_SUPPORT)) {
/* TDLS Discovery Response */ /* TDLS Discovery Response */
if (nl80211_register_action_frame(bss, (u8 *) "\x04\x0e", 2) < if (nl80211_register_action_frame(bss, (u8 *) "\x04\x0e", 2) <
0) 0)
return -1; ret = -1;
} }
#endif /* CONFIG_TDLS */ #endif /* CONFIG_TDLS */
/* FT Action frames */ /* FT Action frames */
if (nl80211_register_action_frame(bss, (u8 *) "\x06", 1) < 0) if (nl80211_register_action_frame(bss, (u8 *) "\x06", 1) < 0)
return -1; ret = -1;
else else
drv->capa.key_mgmt |= WPA_DRIVER_CAPA_KEY_MGMT_FT | drv->capa.key_mgmt |= WPA_DRIVER_CAPA_KEY_MGMT_FT |
WPA_DRIVER_CAPA_KEY_MGMT_FT_PSK; WPA_DRIVER_CAPA_KEY_MGMT_FT_PSK;
/* WNM - BSS Transition Management Request */ /* WNM - BSS Transition Management Request */
if (nl80211_register_action_frame(bss, (u8 *) "\x0a\x07", 2) < 0) if (nl80211_register_action_frame(bss, (u8 *) "\x0a\x07", 2) < 0)
return -1; ret = -1;
/* WNM-Sleep Mode Response */ /* WNM-Sleep Mode Response */
if (nl80211_register_action_frame(bss, (u8 *) "\x0a\x11", 2) < 0) if (nl80211_register_action_frame(bss, (u8 *) "\x0a\x11", 2) < 0)
return -1; ret = -1;
nl80211_mgmt_handle_register_eloop(bss); nl80211_mgmt_handle_register_eloop(bss);
return 0; return ret;
} }