From bb05d03606add80708480b621a73fa9cc3ebbe6d Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 23 Feb 2019 18:54:54 +0200 Subject: [PATCH] Fix a regression from VLAN assignment using WPA/WPA2 passphrase/PSK This extension of VLAN assignment code had a bug in one of the code paths where vlan_id could have been left uninitialized. This could result in SAE authentication getting rejected in cases where VLAN assignment is not used if the uninitialized stack memory had nonzero value. Fixes: dbfa691df4dc ("VLAN assignment based on used WPA/WPA2 passphrase/PSK") Signed-off-by: Jouni Malinen --- src/ap/wpa_auth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c index 02f0ec6a7..cc77acb1b 100644 --- a/src/ap/wpa_auth.c +++ b/src/ap/wpa_auth.c @@ -1,6 +1,6 @@ /* * IEEE 802.11 RSN / WPA Authenticator - * Copyright (c) 2004-2018, Jouni Malinen + * Copyright (c) 2004-2019, Jouni Malinen * * This software may be distributed under the terms of the BSD license. * See README for more details. @@ -2729,7 +2729,7 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING) struct ieee802_1x_hdr *hdr; struct wpa_eapol_key *key; struct wpa_eapol_ie_parse kde; - int vlan_id; + int vlan_id = 0; SM_ENTRY_MA(WPA_PTK, PTKCALCNEGOTIATING, wpa_ptk); sm->EAPOLKeyReceived = FALSE;