[2/8] WNM: Allow frames from AP MLD

Message ID	20231213140412.326465-2-andrei.otcheretianski@intel.com
State	Accepted
Headers	show Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> From: Andrei Otcheretianski <andrei.otcheretianski@intel.com> To: hostap@lists.infradead.org Cc: Ilan Peer <ilan.peer@intel.com> Subject: [PATCH 2/8] WNM: Allow frames from AP MLD Date: Wed, 13 Dec 2023 16:04:06 +0200 Message-Id: <20231213140412.326465-2-andrei.otcheretianski@intel.com> MIME-Version: 1.0 preview: From: Ilan Peer <ilan.peer@intel.com> Allow frames where the DA is the AP MLD address as the driver might have performed address translation. Signed-off-by: Ilan Peer <ilan.peer@intel.com> --- wpa_supplicant/wnm_sta.c \| 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) Content analysis details: (-0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
Series	[1/8] AP: WNM: Use correct address when configured as AP MLD \| expand [1/8] AP: WNM: Use correct address when configured as AP MLD [2/8] WNM: Allow frames from AP MLD [3/8] AP: Use AP MLD address when sending de-authentication and disassociation [4/8] AP: When sending action frames, use MLD address if needed [5/8] AP: MLD: Extend BSS transition management request [6/8] WNM: Handle BTM request with "Link Removal Imminent" [7/8] tests: Verify BTM request with link removal imminent flow [8/8] WNM: Skip current connection BSS when disassociate imminent is set

Message ID

20231213140412.326465-2-andrei.otcheretianski@intel.com

State

Accepted

Headers

From: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
To: hostap@lists.infradead.org
Cc: Ilan Peer <ilan.peer@intel.com>
Subject: [PATCH 2/8] WNM: Allow frames from AP MLD
Date: Wed, 13 Dec 2023 16:04:06 +0200
Message-Id: <20231213140412.326465-2-andrei.otcheretianski@intel.com>
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "Hostap" <hostap-bounces@lists.infradead.org>
Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org

Series

[1/8] AP: WNM: Use correct address when configured as AP MLD | expand

Commit Message

Otcheretianski, Andrei Dec. 13, 2023, 2:04 p.m. UTC

From: Ilan Peer <ilan.peer@intel.com>

Allow frames where the DA is the AP MLD address as the driver might
have performed address translation.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
---
 wpa_supplicant/wnm_sta.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index ccfc34d20b..493821b37f 100644
--- a/wpa_supplicant/wnm_sta.c
+++ b/wpa_supplicant/wnm_sta.c
@@ -1878,7 +1878,8 @@  static void ieee802_11_rx_wnm_notif_req(struct wpa_supplicant *wpa_s,
 		    pos, end - pos);
 
 	if (wpa_s->wpa_state != WPA_COMPLETED ||
-	    os_memcmp(sa, wpa_s->bssid, ETH_ALEN) != 0) {
+	    (os_memcmp(sa, wpa_s->bssid, ETH_ALEN) &&
+	     os_memcmp(sa, wpa_s->ap_mld_addr, ETH_ALEN))) {
 		wpa_dbg(wpa_s, MSG_DEBUG, "WNM: WNM-Notification frame not "
 			"from our AP - ignore it");
 		return;
@@ -1922,7 +1923,8 @@  static void ieee802_11_rx_wnm_coloc_intf_req(struct wpa_supplicant *wpa_s,
 		return; /* only nonzero values are used for request */
 
 	if (wpa_s->wpa_state != WPA_COMPLETED ||
-	    os_memcmp(sa, wpa_s->bssid, ETH_ALEN) != 0) {
+	    (os_memcmp(sa, wpa_s->bssid, ETH_ALEN) &&
+	     os_memcmp(sa, wpa_s->ap_mld_addr, ETH_ALEN))) {
 		wpa_dbg(wpa_s, MSG_DEBUG,
 			"WNM: Collocated Interference Request frame not from current AP - ignore it");
 		return;
@@ -1952,9 +1954,10 @@  void ieee802_11_rx_wnm_action(struct wpa_supplicant *wpa_s,
 	wpa_printf(MSG_DEBUG, "WNM: RX action %u from " MACSTR,
 		   act, MAC2STR(mgmt->sa));
 	if (wpa_s->wpa_state < WPA_ASSOCIATED ||
-	    os_memcmp(mgmt->sa, wpa_s->bssid, ETH_ALEN) != 0) {
-		wpa_printf(MSG_DEBUG, "WNM: Ignore unexpected WNM Action "
-			   "frame");
+	    (os_memcmp(mgmt->sa, wpa_s->bssid, ETH_ALEN) &&
+	     os_memcmp(mgmt->sa, wpa_s->ap_mld_addr, ETH_ALEN))) {
+		wpa_printf(MSG_DEBUG,
+			   "WNM: Ignore unexpected WNM Action frame");
 		return;
 	}

[2/8] WNM: Allow frames from AP MLD

Commit Message

Patch