Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=01a23b7d337a295e0ee346aaa202b8ef85027206

commit 01a23b7d337a295e0ee346aaa202b8ef85027206
Author: kikadf <[email protected]>
Date:   Sun Oct 19 11:06:08 2014 +0200

hostapd-1.1-3-x86_64

* Fix CVE-2014-3686

diff --git a/source/network-extra/hostapd/CVE-2014-3686.patch 
b/source/network-extra/hostapd/CVE-2014-3686.patch
new file mode 100644
index 0000000..d35b289
--- /dev/null
+++ b/source/network-extra/hostapd/CVE-2014-3686.patch
@@ -0,0 +1,54 @@
+From 5d4fa2a29bef013e61185beb21a3ec110885eb9a Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <[email protected]>
+Date: Mon, 6 Oct 2014 18:49:01 +0300
+Subject: [PATCH 3/3] hostapd_cli: Use os_exec() for action script execution
+
+Use os_exec() to run the action script operations to avoid undesired
+command line processing for control interface event strings. Previously,
+it could have been possible for some of the event strings to include
+unsanitized data which is not suitable for system() use. (CVE-2014-3686)
+
+Signed-off-by: Jouni Malinen <[email protected]>
+---
+ hostapd/hostapd_cli.c | 25 ++++++++-----------------
+ 1 file changed, 8 insertions(+), 17 deletions(-)
+
+--- a/hostapd/hostapd_cli.c
++++ b/hostapd/hostapd_cli.c
+@@ -239,28 +239,19 @@ static int hostapd_cli_cmd_mib(struct wp
+ static int hostapd_cli_exec(const char *program, const char *arg1,
+                           const char *arg2)
+ {
+-      char *cmd;
++      char *arg;
+       size_t len;
+       int res;
+-      int ret = 0;
+
+-      len = os_strlen(program) + os_strlen(arg1) + os_strlen(arg2) + 3;
+-      cmd = os_malloc(len);
+-      if (cmd == NULL)
++      len = os_strlen(arg1) + os_strlen(arg2) + 2;
++      arg = os_malloc(len);
++      if (arg == NULL)
+               return -1;
+-      res = os_snprintf(cmd, len, "%s %s %s", program, arg1, arg2);
+-      if (res < 0 || (size_t) res >= len) {
+-              os_free(cmd);
+-              return -1;
+-      }
+-      cmd[len - 1] = '\0';
+-#ifndef _WIN32_WCE
+-      if (system(cmd) < 0)
+-              ret = -1;
+-#endif /* _WIN32_WCE */
+-      os_free(cmd);
++      os_snprintf(arg, len, "%s %s", arg1, arg2);
++      res = os_exec(program, arg, 1);
++      os_free(arg);
+
+-      return ret;
++      return res;
+ }
+
+
diff --git a/source/network-extra/hostapd/FrugalBuild 
b/source/network-extra/hostapd/FrugalBuild
index 1b5af4c..ca77a21 100644
--- a/source/network-extra/hostapd/FrugalBuild
+++ b/source/network-extra/hostapd/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=hostapd
pkgver=1.1
-pkgrel=2
+pkgrel=3
pkgdesc="A daemon for managing software wireless access points."
url="http://hostap.epitest.fi/hostapd";
depends=('openssl>=1.0.0' 'libnl>=3.2.9')
@@ -21,6 +21,13 @@ sha1sums=('247ab472d501ef3e10b271446842527143976708' \
_F_systemd_units=($pkgname=)
Finclude systemd

+# FSA fix ***
+source=(${source[@]} CVE-2014-3686.patch CVE-2014-3686-1.patch)
+sha1sums=(${sha1sums[@]} '776164a788254d46f2ce0f46b3f090de4fe8905c' \
+                         'bfef0dc799312e97bd65f6e6c9011f51c2766ff7')
+# ***********
+
+
build() {
Fcd $pkgname-$pkgver
Fpatchall
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to