In case kmemdup fails, the fix sets conn_info->req_ie_len to zero
to avoid buffer overflows.

Signed-off-by: Kangjie Lu <k...@umn.edu>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index e92f6351bd22..5d9a3c35fef5 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -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->req_ie_len = 0;
        } else {
                conn_info->resp_ie_len = 0;
                conn_info->resp_ie = NULL;
-- 
2.17.1

Reply via email to