Skip to content

Commit 4c7021c

Browse files
Arend van Sprielgregkh
authored andcommitted
brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx()
commit 8f44c9a41386729fea410e688959ddaa9d51be7c upstream. The lower level nl80211 code in cfg80211 ensures that "len" is between 25 and NL80211_ATTR_FRAME (2304). We subtract DOT11_MGMT_HDR_LEN (24) from "len" so thats's max of 2280. However, the action_frame->data[] buffer is only BRCMF_FIL_ACTION_FRAME_SIZE (1800) bytes long so this memcpy() can overflow. memcpy(action_frame->data, &buf[DOT11_MGMT_HDR_LEN], le16_to_cpu(action_frame->len)); Fixes: 18e2f61 ("brcmfmac: P2P action frame tx.") Reported-by: "freenerguo(郭大兴)" <freenerguo@tencent.com> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9618eb4 commit 4c7021c

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4472,6 +4472,11 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
44724472
cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true,
44734473
GFP_KERNEL);
44744474
} else if (ieee80211_is_action(mgmt->frame_control)) {
4475+
if (len > BRCMF_FIL_ACTION_FRAME_SIZE + DOT11_MGMT_HDR_LEN) {
4476+
brcmf_err("invalid action frame length\n");
4477+
err = -EINVAL;
4478+
goto exit;
4479+
}
44754480
af_params = kzalloc(sizeof(*af_params), GFP_KERNEL);
44764481
if (af_params == NULL) {
44774482
brcmf_err("unable to allocate frame\n");

0 commit comments

Comments
 (0)