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 /hostapd | |
| 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 'hostapd')
| -rw-r--r-- | hostapd/hostapd_cli.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c index 09b7284e..9e62befc 100644 --- a/hostapd/hostapd_cli.c +++ b/hostapd/hostapd_cli.c @@ -238,28 +238,19 @@ static int hostapd_cli_cmd_mib(struct wpa_ctrl *ctrl, int argc, char *argv[]) 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; } |