| From 8cfe3bf68e2af21db3c03021187c0e3fe35c316a Mon Sep 17 00:00:00 2001 |
| From: Kangjie Lu <kjlu@umn.edu> |
| Date: Fri, 15 Mar 2019 12:04:32 -0500 |
| Subject: brcmfmac: fix missing checks for kmemdup |
| |
| [ Upstream commit 46953f97224d56a12ccbe9c6acaa84ca0dab2780 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 e92f6351bd224..8ee8af4e7ec4f 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->resp_ie_len = 0; |
| } else { |
| conn_info->resp_ie_len = 0; |
| conn_info->resp_ie = NULL; |
| -- |
| 2.20.1 |
| |