36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 46953f97224d56a12ccbe9c6acaa84ca0dab2780 Mon Sep 17 00:00:00 2001
|
|
From: Kangjie Lu <kjlu@umn.edu>
|
|
Date: Fri, 15 Mar 2019 12:04:32 -0500
|
|
Subject: [PATCH] brcmfmac: fix missing checks for kmemdup
|
|
|
|
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 | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
|
|
@@ -5436,6 +5436,8 @@ static s32 brcmf_get_assoc_ies(struct br
|
|
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;
|
|
@@ -5452,6 +5454,8 @@ static s32 brcmf_get_assoc_ies(struct br
|
|
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;
|