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

WPS: Fix UPnP deinit order to avoid using freed memory

Browse source 
When multiple wireless interfaces are used with WPS, the UPnP
subscriptions need to be removed whenever a matching Registrar
instance gets removed. This avoids a segfault due to access to
freed memory during hostapd shutdown.

In addition, the UPnP interface instance structure needs to be
freed to avoid memory leak.
This commit is contained in:
Jouni Malinen 2010-11-11 16:56:36 +02:00 committed by Jouni Malinen
parent c17b1e274f
commit bc8714283d
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/wps/wps_upnp.c
View file

@ -955,10 +955,13 @@ static void upnp_wps_free_msearchreply(struct dl_list *head)
} }
static void upnp_wps_free_subscriptions(struct dl_list *head) static void upnp_wps_free_subscriptions(struct dl_list *head,
struct wps_registrar *reg)
{ {
struct subscription *s, *tmp; struct subscription *s, *tmp;
dl_list_for_each_safe(s, tmp, head, struct subscription, list) { dl_list_for_each_safe(s, tmp, head, struct subscription, list) {
if (reg && s->reg != reg)
continue;
dl_list_del(&s->list); dl_list_del(&s->list);
subscription_destroy(s); subscription_destroy(s);
} }
@ -977,7 +980,7 @@ static void upnp_wps_device_stop(struct upnp_wps_device_sm *sm)
wpa_printf(MSG_DEBUG, "WPS UPnP: Stop device"); wpa_printf(MSG_DEBUG, "WPS UPnP: Stop device");
web_listener_stop(sm); web_listener_stop(sm);
upnp_wps_free_msearchreply(&sm->msearch_replies); upnp_wps_free_msearchreply(&sm->msearch_replies);
upnp_wps_free_subscriptions(&sm->subscriptions); upnp_wps_free_subscriptions(&sm->subscriptions, NULL);
advertisement_state_machine_stop(sm, 1); advertisement_state_machine_stop(sm, 1);
@ -1092,13 +1095,16 @@ void upnp_wps_device_deinit(struct upnp_wps_device_sm *sm, void *priv)
wpa_printf(MSG_DEBUG, "WPS UPnP: Deinitializing last instance " wpa_printf(MSG_DEBUG, "WPS UPnP: Deinitializing last instance "
"- free global device instance"); "- free global device instance");
upnp_wps_device_stop(sm); upnp_wps_device_stop(sm);
} } else
upnp_wps_free_subscriptions(&sm->subscriptions,
iface->wps->registrar);
dl_list_del(&iface->list); dl_list_del(&iface->list);
if (iface->peer.wps) if (iface->peer.wps)
wps_deinit(iface->peer.wps); wps_deinit(iface->peer.wps);
os_free(iface->ctx->ap_pin); os_free(iface->ctx->ap_pin);
os_free(iface->ctx); os_free(iface->ctx);
os_free(iface);
if (dl_list_empty(&sm->interfaces)) { if (dl_list_empty(&sm->interfaces)) {
os_free(sm->root_dir); os_free(sm->root_dir);