aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2015-09-05 09:32:58 (GMT)
committerJouni Malinen <j@w1.fi>2015-09-05 09:32:58 (GMT)
commitc968f2d56c7a89efec14412c5e7b3f90c638a1bf (patch)
tree917dedb4848319c94833cf77482f3c05b4747f21
parent20396ab8e4cf69c96bcd432d0dfe49d00ae0edab (diff)
downloadhostap-c968f2d56c7a89efec14412c5e7b3f90c638a1bf.zip
hostap-c968f2d56c7a89efec14412c5e7b3f90c638a1bf.tar.gz
hostap-c968f2d56c7a89efec14412c5e7b3f90c638a1bf.tar.bz2
wpa_priv: Clear extended_capa pointers
For now, there is no support for passing extended_capa pointers through the driver_privsep.c interface from wpa_priv. Avoid leaving bogus pointers by explicitly clearing these on both wpa_priv and wpa_supplicant sides. Signed-off-by: Jouni Malinen <j@w1.fi>
-rw-r--r--src/drivers/driver_privsep.c4
-rw-r--r--wpa_supplicant/wpa_priv.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/drivers/driver_privsep.c b/src/drivers/driver_privsep.c
index 1cfc15d..64a65a6 100644
--- a/src/drivers/driver_privsep.c
+++ b/src/drivers/driver_privsep.c
@@ -703,6 +703,10 @@ static int wpa_driver_privsep_get_capa(void *priv,
res = wpa_priv_cmd(drv, PRIVSEP_CMD_GET_CAPA, NULL, 0, capa, &len);
if (res < 0 || len != sizeof(*capa))
return -1;
+ /* For now, no support for passing extended_capa pointers */
+ capa->extended_capa = NULL;
+ capa->extended_capa_mask = NULL;
+ capa->extended_capa_len = 0;
return 0;
}
diff --git a/wpa_supplicant/wpa_priv.c b/wpa_supplicant/wpa_priv.c
index a7aa430..c8335fc 100644
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
@@ -330,6 +330,10 @@ static void wpa_priv_cmd_get_capa(struct wpa_priv_interface *iface,
iface->driver->get_capa(iface->drv_priv, &capa) < 0)
goto fail;
+ /* For now, no support for passing extended_capa pointers */
+ capa.extended_capa = NULL;
+ capa.extended_capa_mask = NULL;
+ capa.extended_capa_len = 0;
sendto(iface->fd, &capa, sizeof(capa), 0, (struct sockaddr *) from,
sizeof(*from));
return;