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

commit f3345d1620e7d6e41948351d135a2ef897271307
Author: kikadf <[email protected]>
Date:   Sun Oct 19 11:04:07 2014 +0200

wpa_supplicant-1.1-2-x86_64

* Fix CVE-2014-3686

diff --git a/source/base/wpa_supplicant/CVE-2014-3686-1.patch 
b/source/base/wpa_supplicant/CVE-2014-3686-1.patch
new file mode 100644
index 0000000..6ca7726
--- /dev/null
+++ b/source/base/wpa_supplicant/CVE-2014-3686-1.patch
@@ -0,0 +1,110 @@
+From 89de07a9442072f88d49869d8ecd8d42bae050a0 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <[email protected]>
+Date: Mon, 6 Oct 2014 16:27:44 +0300
+Subject: [PATCH 1/3] Add os_exec() helper to run external programs
+
+Signed-off-by: Jouni Malinen <[email protected]>
+---
+ src/utils/os.h       |  9 +++++++++
+ src/utils/os_unix.c  | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/utils/os_win32.c |  6 ++++++
+ 3 files changed, 70 insertions(+)
+
+--- a/src/utils/os.h
++++ b/src/utils/os.h
+@@ -485,6 +485,15 @@ char * os_strdup(const char *s);
+  */
+ size_t os_strlcpy(char *dest, const char *src, size_t siz);
+
++/**
++ * os_exec - Execute an external program
++ * @program: Path to the program
++ * @arg: Command line argument string
++ * @wait_completion: Whether to wait until the program execution completes
++ * Returns: 0 on success, -1 on error
++ */
++int os_exec(const char *program, const char *arg, int wait_completion);
++
+
+ #ifdef OS_REJECT_C_LIB_FUNCTIONS
+ #define malloc OS_DO_NOT_USE_malloc
+--- a/src/utils/os_unix.c
++++ b/src/utils/os_unix.c
+@@ -15,6 +15,7 @@
+ #include "includes.h"
+
+ #include <time.h>
++#include <sys/wait.h>
+
+ #ifdef ANDROID
+ #include <linux/capability.h>
+@@ -492,3 +493,57 @@ char * os_strdup(const char *s)
+ }
+
+ #endif /* WPA_TRACE */
++
++
++int os_exec(const char *program, const char *arg, int wait_completion)
++{
++      pid_t pid;
++      int pid_status;
++
++      pid = fork();
++      if (pid < 0) {
++              perror("fork");
++              return -1;
++      }
++
++      if (pid == 0) {
++              /* run the external command in the child process */
++              const int MAX_ARG = 30;
++              char *_program, *_arg, *pos;
++              char *argv[MAX_ARG + 1];
++              int i;
++
++              _program = os_strdup(program);
++              _arg = os_strdup(arg);
++
++              argv[0] = _program;
++
++              i = 1;
++              pos = _arg;
++              while (i < MAX_ARG && pos && *pos) {
++                      while (*pos == ' ')
++                              pos++;
++                      if (*pos == '\0')
++                              break;
++                      argv[i++] = pos;
++                      pos = os_strchr(pos, ' ');
++                      if (pos)
++                              *pos++ = '\0';
++              }
++              argv[i] = NULL;
++
++              execv(program, argv);
++              perror("execv");
++              os_free(_program);
++              os_free(_arg);
++              exit(0);
++              return -1;
++      }
++
++      if (wait_completion) {
++              /* wait for the child process to complete in the parent */
++              waitpid(pid, &pid_status, 0);
++      }
++
++      return 0;
++}
+--- a/src/utils/os_win32.c
++++ b/src/utils/os_win32.c
+@@ -239,3 +239,9 @@ size_t os_strlcpy(char *dest, const char
+
+       return s - src - 1;
+ }
++
++
++int os_exec(const char *program, const char *arg, int wait_completion)
++{
++      return -1;
++}
diff --git a/source/base/wpa_supplicant/CVE-2014-3686-2.patch 
b/source/base/wpa_supplicant/CVE-2014-3686-2.patch
new file mode 100644
index 0000000..4afeb07
--- /dev/null
+++ b/source/base/wpa_supplicant/CVE-2014-3686-2.patch
@@ -0,0 +1,54 @@
+From c5f258de76dbb67fb64beab39a99e5c5711f41fe Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <[email protected]>
+Date: Mon, 6 Oct 2014 17:25:52 +0300
+Subject: [PATCH 2/3] wpa_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]>
+---
+ wpa_supplicant/wpa_cli.c | 25 ++++++++-----------------
+ 1 file changed, 8 insertions(+), 17 deletions(-)
+
+--- a/wpa_supplicant/wpa_cli.c
++++ b/wpa_supplicant/wpa_cli.c
+@@ -3188,28 +3188,19 @@ static int str_match(const char *a, cons
+ static int wpa_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/base/wpa_supplicant/FrugalBuild 
b/source/base/wpa_supplicant/FrugalBuild
index 4a3618f..f3d9b2a 100644
--- a/source/base/wpa_supplicant/FrugalBuild
+++ b/source/base/wpa_supplicant/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=wpa_supplicant
pkgver=1.1
-pkgrel=1
+pkgrel=2
pkgdesc="Linux WPA/WPA2/IEEE 802.1X Supplicant"
url="http://hostap.epitest.fi/wpa_supplicant/";
depends=('openssl>=1.0.0' 'libnl>=3.2.9' 'dbus' 'readline')
@@ -20,6 +20,14 @@ sha1sums=('88aefc69b6530abd1ba2c6990c28555fd0bfca4a' \
_F_systemd_units=($pkgname=)
Finclude systemd

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

Reply via email to