Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795053891; b=CgEXEM5nvEL6SKflVj/LEBzWlc2q3bJ8xIt49NikV0eLNhdkKt/Fpuy2nf3ySyAEDfJG g+leT0vmK3qTRRgOD9clY9OMkfzHVcckRMHwgkw1BAIfmhEOT66PPhhiV4KyYvA0l9+Oj NA0Msaqfvc385nSUA7MNkqlqBt8UbT5MkC6wxQnKx5OFMz9fMfMs0ZBi7E5GkjZKEXTEC 5mNRmEeve0lepMyExuwgeV2Wjd88GuKbfOJRA5Su0YaA6yxTzg4kcxO9zJUPhs/cZ5TC8 34+A2VNhzuwKuFWxOa/w8djrIBsS+pzneaFdMPMm58fFPClvSp0fHFOPNG80COQKncQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053891; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=cqb6ciz/jXFPyBdqcn0ecSQcQvO37jMznAPCUV65kwc=; b=Xg26zXEpgORQkmvqOv4daIGPect4gJpnEoyHDepzlNWKusvfXvX+EfJ+LMmzqo4Y0Haa rGveicaqTSFu07zbZfQ7dZuLa6h1K3Tcq4n2BcDVwFSTpG+J/JGDkeYEDr3Puj1ZIZL4X m3DqUMw5Kd7EoNN2CIlqDNAuoWD00wkdZrlLXsiGWF9WD7PJ3TpnMbEhx/FeFy9w+Pe8y ijfdjTZfQHCdMAnAGCLJRW50OJMHfablq3PFgBsl3GdfEBDqH8JqFBvdVopoe1LVg/0J1 HJurww8aJjto8YVTLTWcG3MfPZIdzyXWExQgZHtJLRbnFzj0e5oMbK5NIxYdmNKHAhw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=ZPG4t5bF; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A512C606A31C; Thu, 19 Nov 2026 02:04:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=ZPG4t5bF Received: by smtp.kernel.org (Postfix) with ESMTPSA id 067F01F000C5; Thu, 19 Nov 2026 02:04:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053891; bh=cqb6ciz/jXFPyBdqcn0ecSQcQvO37jMznAPCUV65kwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZPG4t5bFb6fzBNalMNzvHe4n/H3/mE24KKl1E7lREZr0Apvu4VDNzxamZdSOqqniC VSYFLAmDS5XYU7fnf1lUP5T1YdyTjV+iupUr9mRKxXJsZ2RxHt1sFvyolrB//KN5l1 +GX09ftn7M3sFjdNd0DQhdox9xZ9QmL4IB0O3TZU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Janne Grunau , Neal Gompa , Arend van Spriel , Johannes Berg , Sasha Levin Subject: [PATCH 5.15 1081/2214] wifi: brcmfmac: cfg80211: Report port_authorized for 4-way HS offload Date: Wed, 18 Nov 2026 15:45:57 +0100 Message-ID: <20261118150055.486581750@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Janne Grunau [ Upstream commit 6fff9de5c5b425817588eeed42bd56d665751c13 ] Since commit 416386060 ("Mark authorization completed on driver indication during 4-way HS offload") [0] wpa_supplicant expects NL80211_CMD_PORT_AUTHORIZED to complete the authentication when the driver supports 4-way handshake offload. This was apparently never tested with the upstream brcmfmac driver as it does not report this. This broke authentication on Apple silicon devices (BRCM4378, BRMC4387, BRMC4388) and other devices when wpa_supplicant 2.11 was released [1]. This was initially dealt with by reverting the commit in Fedora [2] and other Linux distributions. Instead of carrying the revert over to wpa_supplicant 2.12 add the expected NL80211_CMD_PORT_AUTHORIZED when the connection is established. The "Fixes:" tag is not fully accurate as this has only became an issue after userspace changes years after the change. Since the change is expected to be required in all active stable branches for wpa_supplicant 2.11 / 2.12 compatibility it is helpful even though BRCMF_PROFILE_FWSUP_SAE did not exists then. Link: https://github.com/zephyrproject-rtos/hostap/commit/41638606054a09867fe3f9a2b5523aa4678cbfa5 [0] Link: https://lists.infradead.org/pipermail/hostap/2024-August/042893.html [1] Link: https://bugzilla.redhat.com/show_bug.cgi?id=2302577 [2] Link: https://lore.kernel.org/linux-wireless/20260911065656.1269623-5-Jason.Huang2@infineon.com/ [3] Cc: stable@vger.kernel.org Fixes: b8a64f0e96c2 ("brcmfmac: support 4-way handshake offloading for WPA/WPA2-PSK") Signed-off-by: Janne Grunau Reviewed-by: Neal Gompa Acked-by: Arend van Spriel Link: https://patch.msgid.link/20260915-brcmfmac-4way-handshake-offload-authenticated-event-v2-1-fbb9cc7ac177@jannau.net Signed-off-by: Johannes Berg [ sashal: replaced the authorization helper with an inline PSK/SAE check using the three-argument cfg80211_port_authorized() API ] Signed-off-by: Sasha Levin --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 13ea5f0c8e1e1..aec1c0b9ef08c 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -6029,6 +6029,7 @@ brcmf_bss_connect_done(struct brcmf_cfg80211_info *cfg, struct brcmf_cfg80211_profile *profile = &ifp->vif->profile; struct brcmf_cfg80211_connect_info *conn_info = cfg_to_conn(cfg); struct cfg80211_connect_resp_params conn_params; + bool authorized; brcmf_dbg(TRACE, "Enter\n"); @@ -6049,7 +6050,12 @@ brcmf_bss_connect_done(struct brcmf_cfg80211_info *cfg, conn_params.req_ie_len = conn_info->req_ie_len; conn_params.resp_ie = conn_info->resp_ie; conn_params.resp_ie_len = conn_info->resp_ie_len; + authorized = completed && + (profile->use_fwsup == BRCMF_PROFILE_FWSUP_SAE || + profile->use_fwsup == BRCMF_PROFILE_FWSUP_PSK); cfg80211_connect_done(ndev, &conn_params, GFP_KERNEL); + if (authorized) + cfg80211_port_authorized(ndev, profile->bssid, GFP_KERNEL); brcmf_dbg(CONN, "Report connect result - connection %s\n", completed ? "succeeded" : "failed"); } -- 2.53.0