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

hostapd: Fix early init failure path

Browse source 
eloop deinit calls could trigger segmentation fault if the early error
path is hit before eloop_init() gets called.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2016-06-13 00:36:18 +03:00
parent 976dfb3237
commit cc27c8e680
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hostapd/main.c
View file

@ -339,6 +339,7 @@ static int hostapd_global_init(struct hapd_interfaces *interfaces,
wpa_printf(MSG_ERROR, "Failed to initialize event loop"); wpa_printf(MSG_ERROR, "Failed to initialize event loop");
return -1; return -1;
} }
interfaces->eloop_initialized = 1;
random_init(entropy_file); random_init(entropy_file);
@ -366,7 +367,7 @@ static int hostapd_global_init(struct hapd_interfaces *interfaces,
} }
static void hostapd_global_deinit(const char *pid_file) static void hostapd_global_deinit(const char *pid_file, int eloop_initialized)
{ {
int i; int i;
@ -384,6 +385,7 @@ static void hostapd_global_deinit(const char *pid_file)
random_deinit(); random_deinit();
if (eloop_initialized)
eloop_destroy(); eloop_destroy();
#ifndef CONFIG_NATIVE_WINDOWS #ifndef CONFIG_NATIVE_WINDOWS
@ -816,8 +818,9 @@ int main(int argc, char *argv[])
} }
os_free(interfaces.iface); os_free(interfaces.iface);
if (interfaces.eloop_initialized)
eloop_cancel_timeout(hostapd_periodic, &interfaces, NULL); eloop_cancel_timeout(hostapd_periodic, &interfaces, NULL);
hostapd_global_deinit(pid_file); hostapd_global_deinit(pid_file, interfaces.eloop_initialized);
os_free(pid_file); os_free(pid_file);
if (log_file) if (log_file)

1
src/ap/hostapd.h
View file

@ -53,6 +53,7 @@ struct hapd_interfaces {
#ifndef CONFIG_NO_VLAN #ifndef CONFIG_NO_VLAN
struct dynamic_iface *vlan_priv; struct dynamic_iface *vlan_priv;
#endif /* CONFIG_NO_VLAN */ #endif /* CONFIG_NO_VLAN */
int eloop_initialized;
}; };
enum hostapd_chan_status { enum hostapd_chan_status {