From: Aloka Dixit <alokad@codeaurora.org>
Date: Tue, 27 Jul 2021 23:42:26 +0000 (-0700)
Subject: RNR: Do not allow FILS Discovery and unsolicited Probe Response simultaneously
X-Git-Tag: hostap_2_10~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b16b88acdb757450ed4d7160bbc854af594e48a8;p=thirdparty%2Fhostap.git

RNR: Do not allow FILS Discovery and unsolicited Probe Response simultaneously

Reduced neighbor report has a field to indicate whether unsolicited
Probe Response transmission is active. Add a check to return failure if
both FILS discovery and unsolicited Probe Response are enabled at the
same time to ensure that RNR includes valid data.

Signed-off-by: Aloka Dixit <alokad@codeaurora.org>
---

diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
index 2e0af2b7e..86b6e097c 100644
--- a/src/ap/ap_config.c
+++ b/src/ap/ap_config.c
@@ -1423,6 +1423,15 @@ static int hostapd_config_check_bss(struct hostapd_bss_config *bss,
 	}
 #endif /* CONFIG_SAE_PK */
 
+#ifdef CONFIG_FILS
+	if (full_config && bss->fils_discovery_min_int &&
+	    bss->unsol_bcast_probe_resp_interval) {
+		wpa_printf(MSG_ERROR,
+			   "Cannot enable both FILS discovery and unsolicited broadcast Probe Response at the same time");
+		return -1;
+	}
+#endif /* CONFIG_FILS */
+
 	return 0;
 }