Fallback to RSNXE when AP is not using valid RSN Overrding

wpa_supplicant was ignoring RSNXE also if the AP is not using valid
RSN overriding combination when the STA supports RSN overriding. Fix
this fallback to the RSNXE when AP is not using valid RSN overriding.

Signed-off-by: Veerendranath Jakkam <quic_vjakkam@quicinc.com>

diff --git a/wpa_supplicant/bss.c b/wpa_supplicant/bss.c
index 8dcda7848df6da9c855a0444100c8b87e6869255..cf94d4be5c0fa9fd6fd69ac5c003b0138ebd7971 100644 (file)
--- a/wpa_supplicant/bss.c
+++ b/wpa_supplicant/bss.c
@@ -2056,7 +2056,7 @@ const u8 * wpa_bss_get_rsnxe(struct wpa_supplicant *wpa_s,
                        if (!tmp || tmp[0] == WLAN_EID_RSN) {
                                /* An acceptable RSNE override element was not
                                 * found, so need to ignore RSNXE overriding. */
-                               return NULL;
+                               goto out;
                        }
 
                        return ie;
@@ -2069,9 +2069,10 @@ const u8 * wpa_bss_get_rsnxe(struct wpa_supplicant *wpa_s,
                        wpa_printf(MSG_DEBUG, "BSS " MACSTR
                                   " advertises RSNXE Override element without RSNE Override 2 element - ignore RSNXE Override element for MLO",
                                   MAC2STR(bss->bssid));
-                       return NULL;
+                       goto out;
                }
        }
 
+out:
        return wpa_bss_get_ie(bss, WLAN_EID_RSNX);
 }