Skip to contentSkip to conversation

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

PATCH Superseded Bogdan Nicolae 2 participants 2 messages Aug 4

Subsystems (2)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 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")

---
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",

--
2.55.0

#1 lore raw
Quoted 23 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")

---
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 +0 -0
index 873754be5..2c59b5e57 100644

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

Quoted 5 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +1 -1
@@ -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 = {};

Need to fix the alignment here.

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

Quoted 9 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +2 -0
    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);

also here.

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

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

Patch needs to pass the checkpatch.pl, before it can be submitted for review.

And need to follow these guidelines for linux wireless
https://wireless.docs.kernel.org/en/latest/en/developers/documentation/submittingpatches.html

Gokul