wifi: brcmfmac: cyw: fix heap overflow on a short auth frame
Subsystems (2)
PATCH 1/1 wifi: brcmfmac: cyw: fix heap overflow on a short auth frame
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.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c +6 -0
@@ -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);
Quoted 3 lines · Maoyi Xie
brcmf_notify_auth_frame_rx()takes the frame length from the firmware event and copies the frame body with the management header offset subtracted:
[...]
Quoted 11 lines
Reject frames shorter than the management header offset before the copy.
Fixes 66f909308a7c ("wifi: brcmfmac: cyw: support external SAE authentication in station mode")Co-developed-by Kaixuan Li <[email protected]>Signed-off-by Kaixuan Li <[email protected]>Signed-off-by Maoyi Xie <[email protected]>--- .../broadcom/brcm80211/brcmfmac/cyw/core.c | 6 ++++++ 1 file changed, 6 insertions(+)
Nit: the Link: tag in the commit message is normally added by the maintainer at apply time, not by the submitter. Please drop it.
Regards,
Arend