From eae3a584f5fde638e593e673cc4fda84d32689d0 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sun, 10 Mar 2013 17:55:24 +0200 Subject: [PATCH] wpa_supplicant: Parse int values in different bases and reject invalid Instead of using atoi(), use strtol() which allows checking if the configuration values are valid integers and can understand more than just decimal (also hexadecimal and octal). This not only allows specifying some fields in hex (which can be useful) but also rejecting invalid configurations, e.g., disassoc_low_ack=27 * 2 which was previously read as just 27. Signed-hostap: Johannes Berg --- wpa_supplicant/config.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index 91d82aea8..139fa9dbf 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -178,10 +178,17 @@ static int wpa_config_parse_int(const struct parse_data *data, struct wpa_ssid *ssid, int line, const char *value) { - int *dst; + int val, *dst; + char *end; dst = (int *) (((u8 *) ssid) + (long) data->param1); - *dst = atoi(value); + val = strtol(value, &end, 0); + if (*end) { + wpa_printf(MSG_ERROR, "Line %d: invalid number \"%s\"", + line, value); + return -1; + } + *dst = val; wpa_printf(MSG_MSGDUMP, "%s=%d (0x%x)", data->name, *dst, *dst); if (data->param3 && *dst < (long) data->param3) { @@ -2590,9 +2597,18 @@ static int wpa_global_config_parse_int(const struct global_parse_data *data, struct wpa_config *config, int line, const char *pos) { - int *dst; + int val, *dst; + char *end; + dst = (int *) (((u8 *) config) + (long) data->param1); - *dst = atoi(pos); + val = strtol(pos, &end, 0); + if (*end) { + wpa_printf(MSG_ERROR, "Line %d: invalid number \"%s\"", + line, pos); + return -1; + } + *dst = val; + wpa_printf(MSG_DEBUG, "%s=%d", data->name, *dst); if (data->param2 && *dst < (long) data->param2) {