aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/377-brcmfmac-only-lock-and-unlock-fws-if-fws-is-not-null.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-01-10 01:30:13 +0000
committerRafał Miłecki <zajec5@gmail.com>2016-01-10 01:30:13 +0000
commit1f13935e70421827c2f1f4d44b8848397e769729 (patch)
tree94a89e9912e0b67651c79c2b5e81ee96fa35f7b5 /package/kernel/mac80211/patches/377-brcmfmac-only-lock-and-unlock-fws-if-fws-is-not-null.patch
parentacad802bceb2d41e003c07a0f17d800151ba7975 (diff)
downloadupstream-1f13935e70421827c2f1f4d44b8848397e769729.tar.gz
upstream-1f13935e70421827c2f1f4d44b8848397e769729.tar.bz2
upstream-1f13935e70421827c2f1f4d44b8848397e769729.zip
mac80211: brcmfmac: add beamforming support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48168 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/377-brcmfmac-only-lock-and-unlock-fws-if-fws-is-not-null.patch')
-rw-r--r--package/kernel/mac80211/patches/377-brcmfmac-only-lock-and-unlock-fws-if-fws-is-not-null.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/377-brcmfmac-only-lock-and-unlock-fws-if-fws-is-not-null.patch b/package/kernel/mac80211/patches/377-brcmfmac-only-lock-and-unlock-fws-if-fws-is-not-null.patch
new file mode 100644
index 0000000000..8ec1441f81
--- /dev/null
+++ b/package/kernel/mac80211/patches/377-brcmfmac-only-lock-and-unlock-fws-if-fws-is-not-null.patch
@@ -0,0 +1,30 @@
+From: Colin Ian King <colin.king@canonical.com>
+Date: Wed, 2 Dec 2015 11:45:10 +0000
+Subject: [PATCH] brcmfmac: only lock and unlock fws if fws is not null
+
+There is a null ptr check for fws to set bcmc_credit_check, however,
+there a lock and unlock on fws should only performed if fwts is
+also not null to also avoid a potential null pointer deference.
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Acked-by: Arend van Spriel <arend@broadcom.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+
+--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+@@ -1609,10 +1609,11 @@ static int brcmf_fws_notify_bcmc_credit_
+ {
+ struct brcmf_fws_info *fws = ifp->drvr->fws;
+
+- brcmf_fws_lock(fws);
+- if (fws)
++ if (fws) {
++ brcmf_fws_lock(fws);
+ fws->bcmc_credit_check = true;
+- brcmf_fws_unlock(fws);
++ brcmf_fws_unlock(fws);
++ }
+ return 0;
+ }
+