Skip to contentSkip to conversation

wifi: brcmfmac: cyw: pass PMKID to firmware if present

PATCH Superseded Bogdan Nicolae 2 participants 2 messages Aug 4 – Aug 5

Subsystems (2)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 wifi: brcmfmac: cyw: pass PMKID to firmware if present

Zero out auth_status on initialization. Otherwise, garbage will leak from the stack to the firmware (when ssid is less than 32 bytes and/or when params->pmkid is set). Then, pass the params->pmkid to the firmware (without it, the firmware caches a garbage PMKID on successful authentication and denies a subsequent association request that includes the PMKID).

Fixes 66f909308a7c ("wifi: brcmfmac: cyw: support external SAE authentication in station mode")

---
v4: Fixed indentation
v3: Added Fixes, Cc: stable, and Acked-by tags
v2: Split into a separate patch

 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +3 -1
index 873754be5..2c59b5e57 100644
@@ -200,7 +200,7 @@ brcmf_cyw_external_auth(struct wiphy *wiphy, struct net_device *dev,
 {
 	struct brcmf_if *ifp;
 	struct brcmf_pub *drvr;
-	struct brcmf_auth_req_status_le auth_status;
+	struct brcmf_auth_req_status_le auth_status = {};
 	int ret = 0;
 
 	brcmf_dbg(TRACE, "Enter\n");
@@ -208,6 +208,8 @@ brcmf_cyw_external_auth(struct wiphy *wiphy, struct net_device *dev,
 	ifp = netdev_priv(dev);
 	drvr = ifp->drvr;
 	if (params->status == WLAN_STATUS_SUCCESS) {
+		if (params->pmkid)
+			memcpy(auth_status.pmkid, params->pmkid, WLAN_PMKID_LEN);
 		auth_status.flags = cpu_to_le16(BRCMF_EXTAUTH_SUCCESS);
 	} else {
 		bphy_err(drvr, "External authentication failed: status=%d\n",
Signature · 1 line
2.55.0
maintainer
#1 lore raw
Quoted 10 lines · Bogdan Nicolae

Zero out auth_status on initialization. Otherwise, garbage will leak from the stack to the firmware (when ssid is less than 32 bytes and/or when params->pmkid is set). Then, pass the params->pmkid to the firmware (without it, the firmware caches a garbage PMKID on successful authentication and denies a subsequent association request that includes the PMKID).

Fixes 66f909308a7c ("wifi: brcmfmac: cyw: support external SAE authentication in station mode")

The checkpatch results on patchwork still show one failure [1].

Regards,
Arend

[1] https://netdev-ctrl.bots.linux.dev/logview.html?f=/logs/build-wireless/1139831/14729070/checkpatch/stdout

Quoted 22 lines

---
v4: Fixed indentation
v3: Added Fixes, Cc: stable, and Acked-by tags
v2: Split into a separate patch

  drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +1 -1
index 873754be5..2c59b5e57 100644
@@ -200,7 +200,7 @@ brcmf_cyw_external_auth(struct wiphy *wiphy, struct net_device *dev,
  {
  	struct brcmf_if *ifp;
  	struct brcmf_pub *drvr;
-	struct brcmf_auth_req_status_le auth_status;
+	struct brcmf_auth_req_status_le auth_status = {};
  	int ret = 0;
 
  	brcmf_dbg(TRACE, "Enter\n");

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c brcmf_cyw_external_auth(struct wiphy *wiphy, struct net_device *dev, · line 212

Quoted 5 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +2 -0
@@ -208,6 +208,8 @@ brcmf_cyw_external_auth(struct wiphy *wiphy, struct net_device *dev,
  	ifp = netdev_priv(dev);
  	drvr = ifp->drvr;
  	if (params->status == WLAN_STATUS_SUCCESS) {
+		if (params->pmkid)
+			memcpy(auth_status.pmkid, params->pmkid, WLAN_PMKID_LEN);

The line above exceeds the 80 column limit.

Quoted 3 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +0 -0
  		auth_status.flags = cpu_to_le16(BRCMF_EXTAUTH_SUCCESS);
  	} else {
  		bphy_err(drvr, "External authentication failed: status=%d\n",