diff options
author | Jouni Malinen <jouni@qca.qualcomm.com> | 2014-10-07 20:08:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 20:08:27 +0000 |
commit | 3bbb64943b5c815d6b22b56f3255d6651294adbe (patch) | |
tree | cca14ed16ecc46008f8c3272c379fdaa3eaeba9d /src | |
parent | 661b4f78e48c697429dc46154a4125892c001718 (diff) | |
parent | 772e12cfed81754a9fd890be7bc77bc602a549b5 (diff) | |
download | android_external_wpa_supplicant_8-3bbb64943b5c815d6b22b56f3255d6651294adbe.tar.gz android_external_wpa_supplicant_8-3bbb64943b5c815d6b22b56f3255d6651294adbe.tar.bz2 android_external_wpa_supplicant_8-3bbb64943b5c815d6b22b56f3255d6651294adbe.zip |
am 772e12cf: Cumulative security CVE-2014-3686 patch
* commit '772e12cfed81754a9fd890be7bc77bc602a549b5':
Cumulative security CVE-2014-3686 patch
Diffstat (limited to 'src')
-rw-r--r-- | src/utils/os.h | 9 | ||||
-rw-r--r-- | src/utils/os_unix.c | 55 | ||||
-rw-r--r-- | src/utils/os_win32.c | 6 |
3 files changed, 70 insertions, 0 deletions
diff --git a/src/utils/os.h b/src/utils/os.h index f196209b..b9247d89 100644 --- a/src/utils/os.h +++ b/src/utils/os.h @@ -601,6 +601,15 @@ size_t os_strlcpy(char *dest, const char *src, size_t siz); */ int os_memcmp_const(const void *a, const void *b, size_t len); +/** + * 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 diff --git a/src/utils/os_unix.c b/src/utils/os_unix.c index 7498967e..523a4d02 100644 --- a/src/utils/os_unix.c +++ b/src/utils/os_unix.c @@ -9,6 +9,7 @@ #include "includes.h" #include <time.h> +#include <sys/wait.h> #ifdef ANDROID #include <sys/capability.h> @@ -554,3 +555,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; +} diff --git a/src/utils/os_win32.c b/src/utils/os_win32.c index 55937dec..57ee1326 100644 --- a/src/utils/os_win32.c +++ b/src/utils/os_win32.c @@ -258,3 +258,9 @@ int os_memcmp_const(const void *a, const void *b, size_t len) return res; } + + +int os_exec(const char *program, const char *arg, int wait_completion) +{ + return -1; +} |