]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
hostapd: Do not update eapol_version with rejected value
authorJouni Malinen <j@w1.fi>
Tue, 27 Dec 2016 09:46:04 +0000 (11:46 +0200)
committerJouni Malinen <j@w1.fi>
Tue, 27 Dec 2016 09:46:04 +0000 (11:46 +0200)
Previously, an invalid eapol_version update command was rejected, but
the actual configuration value was updated.

Signed-off-by: Jouni Malinen <j@w1.fi>
hostapd/config_file.c

index 6077dc93b50fcd1930a2915f216b724dda62a712..34409aef511a8bbb4803fc4028f7f14c3ce5f4f1 100644 (file)
@@ -2158,13 +2158,15 @@ static int hostapd_config_fill(struct hostapd_config *conf,
        } else if (os_strcmp(buf, "ieee8021x") == 0) {
                bss->ieee802_1x = atoi(pos);
        } else if (os_strcmp(buf, "eapol_version") == 0) {
-               bss->eapol_version = atoi(pos);
-               if (bss->eapol_version < 1 || bss->eapol_version > 2) {
+               int eapol_version = atoi(pos);
+
+               if (eapol_version < 1 || eapol_version > 2) {
                        wpa_printf(MSG_ERROR,
                                   "Line %d: invalid EAPOL version (%d): '%s'.",
-                                  line, bss->eapol_version, pos);
+                                  line, eapol_version, pos);
                        return 1;
                }
+               bss->eapol_version = eapol_version;
                wpa_printf(MSG_DEBUG, "eapol_version=%d", bss->eapol_version);
 #ifdef EAP_SERVER
        } else if (os_strcmp(buf, "eap_authenticator") == 0) {