diff options
author | Michal Hrusecky <michal.hrusecky@nic.cz> | 2016-05-12 14:07:15 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-06-15 17:11:18 +0200 |
commit | b67af71181daac3b502fd58d04c021615a23ea39 (patch) | |
tree | feeb71cb63c09cead1e2e03d096838c9ef77ba6d /package/network/services/hostapd/patches/450-scan_wait.patch | |
parent | a3cde627f8acbaaa7bed88ed81577bb23b697fcf (diff) | |
download | master-31e0f0ae-b67af71181daac3b502fd58d04c021615a23ea39.tar.gz master-31e0f0ae-b67af71181daac3b502fd58d04c021615a23ea39.tar.bz2 master-31e0f0ae-b67af71181daac3b502fd58d04c021615a23ea39.zip |
hostapd: Update to version 2016-05-05
Fixes CVE-2016-4476 and few possible memory leaks.
Signed-off-by: Michal Hrusecky <Michal.Hrusecky@nic.cz>
Diffstat (limited to 'package/network/services/hostapd/patches/450-scan_wait.patch')
-rw-r--r-- | package/network/services/hostapd/patches/450-scan_wait.patch | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/package/network/services/hostapd/patches/450-scan_wait.patch b/package/network/services/hostapd/patches/450-scan_wait.patch index 192006a872..3a787e324e 100644 --- a/package/network/services/hostapd/patches/450-scan_wait.patch +++ b/package/network/services/hostapd/patches/450-scan_wait.patch @@ -33,7 +33,7 @@ /* Initialize the driver interface */ if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5])) b = NULL; -@@ -382,8 +394,6 @@ static void hostapd_global_deinit(const +@@ -383,8 +395,6 @@ static void hostapd_global_deinit(const #endif /* CONFIG_NATIVE_WINDOWS */ eap_server_unregister_methods(); @@ -42,19 +42,26 @@ } -@@ -409,11 +419,6 @@ static int hostapd_global_run(struct hap +@@ -410,18 +420,6 @@ static int hostapd_global_run(struct hap } #endif /* EAP_SERVER_TNC */ -- if (daemonize && os_daemonize(pid_file)) { -- wpa_printf(MSG_ERROR, "daemon: %s", strerror(errno)); -- return -1; +- if (daemonize) { +- if (os_daemonize(pid_file)) { +- wpa_printf(MSG_ERROR, "daemon: %s", strerror(errno)); +- return -1; +- } +- if (eloop_sock_requeue()) { +- wpa_printf(MSG_ERROR, "eloop_sock_requeue: %s", +- strerror(errno)); +- return -1; +- } - } - eloop_run(); return 0; -@@ -566,8 +571,7 @@ int main(int argc, char *argv[]) +@@ -579,8 +577,7 @@ int main(int argc, char *argv[]) struct hapd_interfaces interfaces; int ret = 1; size_t i, j; |