Commit a1b993e1 authored Mar 14, 2018 by Stefan Wahren Committed by Greg Kroah-Hartman Jun 13, 2018

brcmfmac: Fix check for ISO3166 code



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>

parent 12958d0f

drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -6167,7 +6167,7 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
		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;