]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx()
authorArend van Spriel <arend.vanspriel@broadcom.com>
Fri, 7 Jul 2017 20:09:06 +0000 (21:09 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 Jul 2017 15:29:56 +0000 (08:29 -0700)
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>
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

index dcde596c9eb9c3fa875c2675318f0298e118549a..7e689c86d56576cf96ca755b16107216470fccdf 100644 (file)
@@ -4934,6 +4934,11 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
                cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, true,
                                        GFP_KERNEL);
        } else if (ieee80211_is_action(mgmt->frame_control)) {
+               if (len > BRCMF_FIL_ACTION_FRAME_SIZE + DOT11_MGMT_HDR_LEN) {
+                       brcmf_err("invalid action frame length\n");
+                       err = -EINVAL;
+                       goto exit;
+               }
                af_params = kzalloc(sizeof(*af_params), GFP_KERNEL);
                if (af_params == NULL) {
                        brcmf_err("unable to allocate frame\n");