diff options
| author | Paul Stewart <pstew@google.com> | 2016-03-03 15:40:19 -0800 |
|---|---|---|
| committer | Sravanthi Palakonda <srapal@codeaurora.org> | 2016-05-30 14:57:45 +0530 |
| commit | 72d795454c45a8cd20f0e2d06b40526e600488c0 (patch) | |
| tree | 750cb27d20ed07778b7aab8ced8bf9564fa467a0 | |
| parent | 008fb49d123ef039b0f594b9476367d48920f93a (diff) | |
| download | android_external_wpa_supplicant_8-72d795454c45a8cd20f0e2d06b40526e600488c0.tar.gz android_external_wpa_supplicant_8-72d795454c45a8cd20f0e2d06b40526e600488c0.tar.bz2 android_external_wpa_supplicant_8-72d795454c45a8cd20f0e2d06b40526e600488c0.zip | |
Remove newlines from wpa_supplicant config network output
Spurious newlines output while writing the config file can corrupt the
wpa_supplicant configuration. Avoid writing these for the network block
parameters. This is a generic filter that cover cases that may not have
been explicitly addressed with a more specific commit to avoid control
characters in the psk parameter.
Signed-off-by: Paul Stewart <pstew@google.com>
Git-commit: 0fe5a234240a108b294a87174ad197f6b5cb38e9
Git-repo: git://w1.fi/srv/git/hostap.git
Change-Id: I35e8483bdda5c391b95da42c2f577d5e9217f2e2
CRs-fixed: 1007548
| -rw-r--r-- | src/utils/common.c | 11 | ||||
| -rw-r--r-- | src/utils/common.h | 1 | ||||
| -rw-r--r-- | wpa_supplicant/config.c | 15 |
3 files changed, 25 insertions, 2 deletions
diff --git a/src/utils/common.c b/src/utils/common.c index 3659b7d8..e77b7db5 100644 --- a/src/utils/common.c +++ b/src/utils/common.c @@ -709,6 +709,17 @@ int has_ctrl_char(const u8 *data, size_t len) } +int has_newline(const char *str) +{ + while (*str) { + if (*str == '\n' || *str == '\r') + return 1; + str++; + } + return 0; +} + + size_t merge_byte_arrays(u8 *res, size_t res_len, const u8 *src1, size_t src1_len, const u8 *src2, size_t src2_len) diff --git a/src/utils/common.h b/src/utils/common.h index 667048b6..7dbb24a6 100644 --- a/src/utils/common.h +++ b/src/utils/common.h @@ -504,6 +504,7 @@ const char * wpa_ssid_txt(const u8 *ssid, size_t ssid_len); char * wpa_config_parse_string(const char *value, size_t *len); int is_hex(const u8 *data, size_t len); int has_ctrl_char(const u8 *data, size_t len); +int has_newline(const char *str); size_t merge_byte_arrays(u8 *res, size_t res_len, const u8 *src1, size_t src1_len, const u8 *src2, size_t src2_len); diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index 2bbb54c0..50a439b7 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -2613,8 +2613,19 @@ char * wpa_config_get(struct wpa_ssid *ssid, const char *var) for (i = 0; i < NUM_SSID_FIELDS; i++) { const struct parse_data *field = &ssid_fields[i]; - if (os_strcmp(var, field->name) == 0) - return field->writer(field, ssid); + if (os_strcmp(var, field->name) == 0) { + char *ret = field->writer(field, ssid); + + if (ret && has_newline(ret)) { + wpa_printf(MSG_ERROR, + "Found newline in value for %s; not returning it", + var); + os_free(ret); + ret = NULL; + } + + return ret; + } } return NULL; |