diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2019-06-16 21:44:51 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-06-16 22:30:49 +0200 |
| commit | af50ce32c5ce41a357b3423d098a40360bfed25e (patch) | |
| tree | 91c4bcfaa27ea2b5196d8f9841791e53d6061991 /package/kernel/mac80211/patches/344-v5.2-brcmfmac-fix-missing-checks-for-kmemdup.patch | |
| parent | d92713d2cfd64fda16a0545b529c8c291300a5f6 (diff) | |
| download | upstream-af50ce32c5ce41a357b3423d098a40360bfed25e.tar.gz upstream-af50ce32c5ce41a357b3423d098a40360bfed25e.tar.bz2 upstream-af50ce32c5ce41a357b3423d098a40360bfed25e.zip | |
mac80211: brcmfmac: backport important fixes from kernel 5.2
1) Crash/Oops fixes
2) One-line patch for BCM43456 support
3) Fix communication with some specific FullMAC firmwares
4) Potential fix for "Invalid packet id" errors
5) Important helper for reporting FullMAC firmware crashes
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 2cd234d96bd772119363a77a35bffa6a4931613e)
Diffstat (limited to 'package/kernel/mac80211/patches/344-v5.2-brcmfmac-fix-missing-checks-for-kmemdup.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/344-v5.2-brcmfmac-fix-missing-checks-for-kmemdup.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/344-v5.2-brcmfmac-fix-missing-checks-for-kmemdup.patch b/package/kernel/mac80211/patches/344-v5.2-brcmfmac-fix-missing-checks-for-kmemdup.patch new file mode 100644 index 0000000000..00759d1118 --- /dev/null +++ b/package/kernel/mac80211/patches/344-v5.2-brcmfmac-fix-missing-checks-for-kmemdup.patch @@ -0,0 +1,35 @@ +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; |