]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: brcmfmac: cyw: fix heap overflow on a short auth frame
authorMaoyi Xie <maoyixie.tju@gmail.com>
Sat, 27 Jun 2026 13:13:13 +0000 (21:13 +0800)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 7 Jul 2026 08:22:35 +0000 (10:22 +0200)
brcmf_notify_auth_frame_rx() takes the frame length from the firmware
event and copies the frame body with the management header offset
subtracted:

u32 mgmt_frame_len = e->datalen - sizeof(struct brcmf_rx_mgmt_data);
...
memcpy(&mgmt_frame->u, frame,
       mgmt_frame_len - offsetof(struct ieee80211_mgmt, u));

The only length check is e->datalen >= sizeof(*rxframe), so mgmt_frame_len
can be anything from 0 up. offsetof(struct ieee80211_mgmt, u) is 24. When
mgmt_frame_len is below that, the subtraction wraps as an unsigned value to
a huge length. The memcpy then runs far past the kzalloc'd buffer. A
malicious or malfunctioning AP can make the frame short during the
external SAE auth exchange, so this is a remotely triggered heap overflow.

Reject frames shorter than the management header offset before the copy.

Fixes: 66f909308a7c ("wifi: brcmfmac: cyw: support external SAE authentication in station mode")
Link: https://lore.kernel.org/r/178214417708.2368577.16740907093694208834@maoyixie.com
Cc: stable@vger.kernel.org
Co-developed-by: Kaixuan Li <kaixuan.li@ntu.edu.sg>
Signed-off-by: Kaixuan Li <kaixuan.li@ntu.edu.sg>
Signed-off-by: Maoyi Xie <maoyixie.tju@gmail.com>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Link: https://patch.msgid.link/20260627131313.3878893-1-maoyixie.tju@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c

index ce09d44fa73cf8fba9e43ad01a5ef1485c05dde9..873754be5174bcaa0096b91761b331b0c7b9c6e9 100644 (file)
@@ -293,6 +293,12 @@ brcmf_notify_auth_frame_rx(struct brcmf_if *ifp,
                return -EINVAL;
        }
 
+       if (mgmt_frame_len < offsetof(struct ieee80211_mgmt, u)) {
+               bphy_err(drvr, "Event %s (%d) frame too small. Ignore\n",
+                        brcmf_fweh_event_name(e->event_code), e->event_code);
+               return -EINVAL;
+       }
+
        wdev = &ifp->vif->wdev;
        WARN_ON(!wdev);