aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend.vanspriel@broadcom.com>2017-07-07 16:09:06 -0400
committerDavid S. Miller <davem@davemloft.net>2017-07-12 11:29:56 -0400
commit8f44c9a41386729fea410e688959ddaa9d51be7c (patch)
tree493fbb48e6e8e917f61d6e3dccd42aeb77543233
parent76b825ab870be3281edac4ae8a414da6e54b0d3a (diff)
brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx()
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)); Cc: stable@vger.kernel.org # 3.9.x Fixes: 18e2f61db3b70 ("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>
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index dcde596c9eb9..7e689c86d565 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -4934,6 +4934,11 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
4934 cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true, 4934 cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true,
4935 GFP_KERNEL); 4935 GFP_KERNEL);
4936 } else if (ieee80211_is_action(mgmt->frame_control)) { 4936 } else if (ieee80211_is_action(mgmt->frame_control)) {
4937 if (len > BRCMF_FIL_ACTION_FRAME_SIZE + DOT11_MGMT_HDR_LEN) {
4938 brcmf_err("invalid action frame length\n");
4939 err = -EINVAL;
4940 goto exit;
4941 }
4937 af_params = kzalloc(sizeof(*af_params), GFP_KERNEL); 4942 af_params = kzalloc(sizeof(*af_params), GFP_KERNEL);
4938 if (af_params == NULL) { 4943 if (af_params == NULL) {
4939 brcmf_err("unable to allocate frame\n"); 4944 brcmf_err("unable to allocate frame\n");