From nobody Sat Jul 25 19:26:39 2026 Received: from mail-oo1-f54.google.com (mail-oo1-f54.google.com [209.85.161.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DBBF480974 for ; Tue, 14 Jul 2026 15:04:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784041485; cv=none; b=rJ2YUveVuwaV3ZkCi+aMs+Cr9/4l7otjkBaVME/oe4FJY5T7KKltdTswRSkZPnaH+lesL0emj7d78tDFTC+9/lur/39zeRw1VUzIA+jsXJYBbxe8pm0Qdf04pZH6Oi/FN8Z6Dscf1hDsD1YldhBGpVID7wPFIrWT1T2MtXKcdCc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784041485; c=relaxed/simple; bh=zw7sWG9NMsbCDcycSEpB+JJ+Mh7QJC4TEmEfQVhsny0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=UWzBHxgjcAFSlZ6VC0jbcxL5RlrAkLTwNxywSA/udSZ5E/7wi3OfRw5EbAm0LQ5ePqaqvSLC6PvhIzkGKDHXZ7EyX61LsH0Hl1TrMPW90sAJnvhCdiFDI9jJn8MbjR7ziFe6B7I3NiHAxFFGfe6F4GifHtSHzvFHyMsZ6ymPErk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DeIh8Z2T; arc=none smtp.client-ip=209.85.161.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DeIh8Z2T" Received: by mail-oo1-f54.google.com with SMTP id 006d021491bc7-6a17fded0a1so159536eaf.2 for ; Tue, 14 Jul 2026 08:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784041483; x=1784646283; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=6ah3OjIXDJ8FGYTbK7t3P/0aF11VxI9dGNiWaxqwvQI=; b=DeIh8Z2TutJGgVSHHRuMdFLl4hJpsIQLgBSn4+yQUfakoxdvJ7sku/ESNbcDBjFRG3 9B+DKNEJRpdmPSN3lfM9/TJ1bDjH/pM78vNSg9njZnNY3t2wa1XPId2Dv82KfE+yVFtC rP3EoDGZTWJYf083/wBXLf2Ijr4BpsUPWcZ0UcXobLuuARuSFztnA9nZiTwNud4PLtYo kpRSM3s2wrYyS3JhaHr4ftnyecVvqPaCjOJSBdHG536ol3VxjFg0vOussVncjR4dlNYG OxVfomnpEWsGeI0sIYRwF/dvZhgxZKpIHxOr774bBdtLWpCk/A6XnYwsoDOgiFyVEfkV 0e0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784041483; x=1784646283; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=6ah3OjIXDJ8FGYTbK7t3P/0aF11VxI9dGNiWaxqwvQI=; b=a0KrUxgBRgxe3W68e9zymXqCNZfJiVTaSPQaboWNm7hMfftqucszPf9I9E4f6Lcy3H lLgf9r0Fr4M6u6f+OkGJ6lso5dUAVjKJj9PQZ9EiozOYb+4zQDQuvHza9xYcfQTqogaW mL2JLuA94dYfsNAey6hUFdCnTaI1WN7CRLUAqN5e0G55z1/8sqnIqUksdxKL8kXWZiIX huODkbAT0gabNvDv5296+UDMKv3kSlXXnp43BHb9PQLorgJCAIXpcoozJdZVMWTrOFFY YghoXY/awyCiV879CyiHxfCSRAdJ6SSEz0KV6+X8CXmCYGUKqyS6shiYiMMkgSberiDn TZAg== X-Forwarded-Encrypted: i=1; AFNElJ+tuQTmhio7aFtIMevtV9jMWldJmsmBH/HbhylewT+mbjCSZSA7m+2IS9wzmIpxs+N9CBT7kyl0vQ4oWzE=@vger.kernel.org X-Gm-Message-State: AOJu0YyDq8jcvx9YRmHOzrI/OdMCNjP7Iaq8BblEppJcTpR8de1hqBWe W0EeavdkiS+YrjII3IHcXyyFmdtMq2MnEBCgyJ/Lj9KZ1mUcjsJUpitk X-Gm-Gg: AfdE7cm5FdOnHUzjcli1TJffNiYe+kfg04XzNpAS0zUTdvFujJRszrME0ySdPrKEw8o nHge8atIU3GSlF7o6uqh1QH37nHo44YNJg5YGW5YmGRtFzldFNax2V/z9k+TX5MMyPBay20lNPK T/yfA0QNLvR7yLAAooQjETAknsuEc53mxKXghINURw8+hoKXGcHAHNoISEZBvP0LKvVYDxF5k7A sdoAZhJ4CI0Zw2zOlIPK1UXsySyyRTzA7MQcU4y7y5qR3qRPXnpo4kAuk6o1jtU6RrQ9puMW/HW U/JmApVvSEb9BkbP5SsqGH6IqIe04B8Jc2o+kNvoPZ10/HWPsgPBYsbcDGco0jdOQ40HzagAzL5 RnApGOCuzFb/fsjUejAewwdfRw6R+lrY+BybQiwu3vwuglNO34AEwJyzlT4bLbFAzfM9mUpbe2k p0kJBPmCw/X5YM5RXpFPSy3ehZ79C1Ld7Z/YvIfMAN+7lR9lVbprb0AdQ+MwU7LULOJsBf/k/0U EHA+j0fcP8n3qTVWMAPc6zBZBsi8BBkprf8EdkPuLMa+ULIJ8EZkfLRUXw= X-Received: by 2002:a05:6830:2692:b0:7e9:c6fd:c36e with SMTP id 46e09a7af769-7ec097b3ac9mr5781922a34.3.1784041483243; Tue, 14 Jul 2026 08:04:43 -0700 (PDT) Received: from 3155-XPS.case.edu (casewireless18.CWRU.Edu. [129.22.1.27]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7ebcae206e2sm15301403a34.2.2026.07.14.08.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2026 08:04:42 -0700 (PDT) From: bogdan.nicolae@gmail.com To: Arend van Spriel Cc: linux-wireless@vger.kernel.org, brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com, linux-kernel@vger.kernel.org, Bogdan Nicolae Subject: [PATCH] wifi: brcmfmac: cyw: clean up PMKID and cookie code Date: Tue, 14 Jul 2026 10:04:23 -0500 Message-ID: <20260714150423.53960-1-bogdan.nicolae@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bogdan Nicolae Avoid setting packet_id to cookie, which is always 0. Instead, use an increasing atomic counter. Avoids mismatches of completion events later in brcmf_notify_mgmt_tx_status, where packet_id !=3D vif->mgmt_tx_id is checked. Also, 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). Signed-off-by: Bogdan Nicolae --- .../net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c b/= drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c index ce09d44fa..99f8c5bef 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c @@ -23,6 +23,8 @@ #define MGMT_AUTH_FRAME_DWELL_TIME 4000 #define MGMT_AUTH_FRAME_WAIT_TIME (MGMT_AUTH_FRAME_DWELL_TIME + 100) =20 +static atomic_t brcmf_cyw_mgmt_tx_id =3D ATOMIC_INIT(0); + static int brcmf_cyw_set_sae_pwd(struct brcmf_if *ifp, struct cfg80211_crypto_settings *crypto) { @@ -123,7 +125,7 @@ int brcmf_cyw_mgmt_tx(struct wiphy *wiphy, struct wirel= ess_dev *wdev, if (!ieee80211_is_auth(mgmt->frame_control)) return brcmf_cfg80211_mgmt_tx(wiphy, wdev, params, cookie); =20 - *cookie =3D 0; + *cookie =3D atomic_inc_return(&brcmf_cyw_mgmt_tx_id); vif =3D container_of(wdev, struct brcmf_cfg80211_vif, wdev); =20 reinit_completion(&vif->mgmt_tx); @@ -200,7 +202,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 =3D {}; int ret =3D 0; =20 brcmf_dbg(TRACE, "Enter\n"); @@ -208,6 +210,8 @@ brcmf_cyw_external_auth(struct wiphy *wiphy, struct net= _device *dev, ifp =3D netdev_priv(dev); drvr =3D ifp->drvr; if (params->status =3D=3D WLAN_STATUS_SUCCESS) { + if (params->pmkid) + memcpy(auth_status.pmkid, params->pmkid, WLAN_PMKID_LEN); auth_status.flags =3D cpu_to_le16(BRCMF_EXTAUTH_SUCCESS); } else { bphy_err(drvr, "External authentication failed: status=3D%d\n", --=20 2.55.0