]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
brcmfmac: fix missing checks for kmemdup
authorKangjie Lu <kjlu@umn.edu>
Fri, 15 Mar 2019 17:04:32 +0000 (12:04 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 4 Apr 2019 10:13:16 +0000 (13:13 +0300)
In case kmemdup fails, the fix sets conn_info->req_ie_len and
conn_info->resp_ie_len to zero to avoid buffer overflows.

Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

index e92f6351bd224d1ded06e645d7c9b23abf1c5382..8ee8af4e7ec4f3270faf0d47a47a86b1dc849716 100644 (file)
@@ -5464,6 +5464,8 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
                conn_info->req_ie =
                    kmemdup(cfg->extra_buf, conn_info->req_ie_len,
                            GFP_KERNEL);
+               if (!conn_info->req_ie)
+                       conn_info->req_ie_len = 0;
        } else {
                conn_info->req_ie_len = 0;
                conn_info->req_ie = NULL;
@@ -5480,6 +5482,8 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
                conn_info->resp_ie =
                    kmemdup(cfg->extra_buf, conn_info->resp_ie_len,
                            GFP_KERNEL);
+               if (!conn_info->resp_ie)
+                       conn_info->resp_ie_len = 0;
        } else {
                conn_info->resp_ie_len = 0;
                conn_info->resp_ie = NULL;