From: Jouni Malinen <j@w1.fi>
Date: Tue, 27 Dec 2016 10:02:53 +0000 (+0200)
Subject: hostapd: Do not update invalid wep_key_len_unicast
X-Git-Tag: hostap_2_7~1929
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5861afcbd3c464a1d6c90fdb83ecbac1fbfe966;p=thirdparty%2Fhostap.git

hostapd: Do not update invalid wep_key_len_unicast

Previously, the update command was rejected, but the configuration
parameter value was updated anyway.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index dc062ffc7..a115c1efe 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -2304,14 +2304,15 @@ static int hostapd_config_fill(struct hostapd_config *conf,
 		}
 		bss->default_wep_key_len = val;
 	} else if (os_strcmp(buf, "wep_key_len_unicast") == 0) {
-		bss->individual_wep_key_len = atoi(pos);
-		if (bss->individual_wep_key_len < 0 ||
-		    bss->individual_wep_key_len > 13) {
-			wpa_printf(MSG_ERROR, "Line %d: invalid WEP key len %d (= %d bits)",
-				   line, bss->individual_wep_key_len,
-				   bss->individual_wep_key_len * 8);
+		int val = atoi(pos);
+
+		if (val < 0 || val > 13) {
+			wpa_printf(MSG_ERROR,
+				   "Line %d: invalid WEP key len %d (= %d bits)",
+				   line, val, val * 8);
 			return 1;
 		}
+		bss->individual_wep_key_len = val;
 	} else if (os_strcmp(buf, "wep_rekey_period") == 0) {
 		bss->wep_rekeying_period = atoi(pos);
 		if (bss->wep_rekeying_period < 0) {