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

Handle Wi-Fi Display commands more carefully if P2P is disabled

Browse source 
If P2P was disabled (e.g., due to driver not supporting it or through
p2p_disabled=1 configuration), setting Wi-Fi Display parameters could
result in segmentation fault when the WFD IE is updated without the P2P
module being initialized. Fix this by skipping the update if P2P module
is not in use. In addition, show Wi-Fi Display as disabled in "GET
wifi_display" and refuse to enable it with "SET wifi_display 1" if P2P
is not enabled.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-02-06 16:03:42 +02:00
parent 334ec001bb
commit bab6677a31
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
wpa_supplicant/ctrl_iface.c
View file

@ -440,7 +440,11 @@ static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s,
ret = wpa_drv_set_p2p_powersave(wpa_s, atoi(value), -1, -1); ret = wpa_drv_set_p2p_powersave(wpa_s, atoi(value), -1, -1);
#ifdef CONFIG_WIFI_DISPLAY #ifdef CONFIG_WIFI_DISPLAY
} else if (os_strcasecmp(cmd, "wifi_display") == 0) { } else if (os_strcasecmp(cmd, "wifi_display") == 0) {
wifi_display_enable(wpa_s->global, !!atoi(value)); int enabled = !!atoi(value);
if (enabled && !wpa_s->global->p2p)
ret = -1;
else
wifi_display_enable(wpa_s->global, enabled);
#endif /* CONFIG_WIFI_DISPLAY */ #endif /* CONFIG_WIFI_DISPLAY */
} else if (os_strcasecmp(cmd, "bssid_filter") == 0) { } else if (os_strcasecmp(cmd, "bssid_filter") == 0) {
ret = set_bssid_filter(wpa_s, value); ret = set_bssid_filter(wpa_s, value);
@ -475,8 +479,13 @@ static int wpa_supplicant_ctrl_iface_get(struct wpa_supplicant *wpa_s,
wpa_s->conf->country[1]); wpa_s->conf->country[1]);
#ifdef CONFIG_WIFI_DISPLAY #ifdef CONFIG_WIFI_DISPLAY
} else if (os_strcasecmp(cmd, "wifi_display") == 0) { } else if (os_strcasecmp(cmd, "wifi_display") == 0) {
res = os_snprintf(buf, buflen, "%d", int enabled;
wpa_s->global->wifi_display); if (wpa_s->global->p2p == NULL ||
wpa_s->global->p2p_disabled)
enabled = 0;
else
enabled = wpa_s->global->wifi_display;
res = os_snprintf(buf, buflen, "%d", enabled);
if (res < 0 || (unsigned int) res >= buflen) if (res < 0 || (unsigned int) res >= buflen)
return -1; return -1;
return res; return res;

3
wpa_supplicant/wifi_display.c
View file

@ -41,6 +41,9 @@ static int wifi_display_update_wfd_ie(struct wpa_global *global)
struct wpabuf *ie, *buf; struct wpabuf *ie, *buf;
size_t len, plen; size_t len, plen;
if (global->p2p == NULL)
return 0;
wpa_printf(MSG_DEBUG, "WFD: Update WFD IE"); wpa_printf(MSG_DEBUG, "WFD: Update WFD IE");
if (!global->wifi_display) { if (!global->wifi_display) {