On Wed, Mar 14, 2018 at 12:02 PM, Stefan Wahren <stefan.wahren@xxxxxxxx> wrote:
> 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.
>
> Signed-off-by: Stefan Wahren <stefan.wahren@xxxxxxxx>
Acked-by: Franky Lin <franky.lin@xxxxxxxxxxxx>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> index 74a8302..5ed718d 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> @@ -6805,7 +6805,7 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
> return;
>
> /* 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 an ISO3166 code (0x%02x 0x%02x)\n",
> req->alpha2[0], req->alpha2[1]);
> --
> 2.7.4
>
