From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 12 Jun 2018 16:17:58 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v3.18.113~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f06a322bc42cc7531b10398834454ace2a6f264;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	brcmfmac-fix-check-for-iso3166-code.patch
---

diff --git a/queue-4.4/brcmfmac-fix-check-for-iso3166-code.patch b/queue-4.4/brcmfmac-fix-check-for-iso3166-code.patch
new file mode 100644
index 00000000000..f195e1db6d9
--- /dev/null
+++ b/queue-4.4/brcmfmac-fix-check-for-iso3166-code.patch
@@ -0,0 +1,36 @@
+From 9b9322db5c5a1917a66c71fe47c3848a9a31227e Mon Sep 17 00:00:00 2001
+From: Stefan Wahren <stefan.wahren@i2se.com>
+Date: Wed, 14 Mar 2018 20:02:59 +0100
+Subject: brcmfmac: Fix check for ISO3166 code
+
+From: Stefan Wahren <stefan.wahren@i2se.com>
+
+commit 9b9322db5c5a1917a66c71fe47c3848a9a31227e upstream.
+
+The commit "regulatory: add NUL to request alpha2" increases the length of
+alpha2 to 3. This causes a regression on brcmfmac, because
+brcmf_cfg80211_reg_notifier() expect valid ISO3166 codes in the complete
+array. So fix this accordingly.
+
+Fixes: 657308f73e67 ("regulatory: add NUL to request alpha2")
+Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
+Acked-by: Franky Lin <franky.lin@broadcom.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+[bwh: Backported to 4.4: adjust filename]
+Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
+@@ -6167,7 +6167,7 @@ static void brcmf_cfg80211_reg_notifier(
+ 		  req->alpha2[0], req->alpha2[1]);
+ 
+ 	/* ignore non-ISO3166 country codes */
+-	for (i = 0; i < sizeof(req->alpha2); i++)
++	for (i = 0; i < 2; i++)
+ 		if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') {
+ 			brcmf_err("not a ISO3166 code\n");
+ 			return;
diff --git a/queue-4.4/series b/queue-4.4/series
index 88d344361ff..8d8a96a208a 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -5,3 +5,4 @@ mmap-relax-file-size-limit-for-regular-files.patch
 kconfig-avoid-format-overflow-warning-from-gcc-8.1.patch
 xfs-fix-incorrect-log_flushed-on-fsync.patch
 drm-set-fmode_unsigned_offset-for-drm-files.patch
+brcmfmac-fix-check-for-iso3166-code.patch