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 <[email protected]>
---
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
Am 15.03.2018 um 07:27 schrieb Rafał Miłecki:
> On 14 March 2018 at 20:02, Stefan Wahren <[email protected]> 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 <[email protected]>
> It sounds like it's worth a:
> Fixes: <sha> ("regulatory: add NUL to request alpha2")
I wasn't sure that i can take the hash from linux-next. I will add this.
Thanks
Stefan
On 14 March 2018 at 20:02, Stefan Wahren <[email protected]> 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 <[email protected]>
It sounds like it's worth a:
Fixes: <sha> ("regulatory: add NUL to request alpha2")
On Wed, Mar 14, 2018 at 12:02 PM, Stefan Wahren <[email protected]> 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 <[email protected]>
Acked-by: Franky Lin <[email protected]>
> ---
> 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
>
On 3/15/2018 10:30 AM, Kalle Valo wrote:
> Arend van Spriel <[email protected]> writes:
>
>> On 3/15/2018 10:15 AM, Kalle Valo wrote:
>>> Stefan Wahren <[email protected]> writes:
>>>
>>>> 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 <[email protected]>
>>>
>>> Arend, the first release for 657308f73e67 is v4.16-rc3 so should this go
>>> to v4.16 as well?
>>>
>>> And "wireless:" in the title is useless, I can remove that.
>>
>> And ": cfg80211" as well?
>
> Ok, I'll remove that.
Thanks
Stefan Wahren <[email protected]> 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.
>
> Fixes: 657308f73e67 ("regulatory: add NUL to request alpha2")
> Signed-off-by: Stefan Wahren <[email protected]>
> Acked-by: Franky Lin <[email protected]>
Patch applied to wireless-drivers.git, thanks.
9b9322db5c5a brcmfmac: Fix check for ISO3166 code
--
https://patchwork.kernel.org/patch/10283389/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Arend van Spriel <[email protected]> writes:
> On 3/15/2018 10:15 AM, Kalle Valo wrote:
>> Stefan Wahren <[email protected]> writes:
>>
>>> 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 <[email protected]>
>>
>> Arend, the first release for 657308f73e67 is v4.16-rc3 so should this go
>> to v4.16 as well?
>>
>> And "wireless:" in the title is useless, I can remove that.
>
> And ": cfg80211" as well?
Ok, I'll remove that.
--
Kalle Valo
Stefan Wahren <[email protected]> writes:
> 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 <[email protected]>
Arend, the first release for 657308f73e67 is v4.16-rc3 so should this go
to v4.16 as well?
And "wireless:" in the title is useless, I can remove that.
--
Kalle Valo
On 3/15/2018 10:15 AM, Kalle Valo wrote:
> Stefan Wahren <[email protected]> writes:
>
>> 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 <[email protected]>
>
> Arend, the first release for 657308f73e67 is v4.16-rc3 so should this go
> to v4.16 as well?
>
> And "wireless:" in the title is useless, I can remove that.
And ": cfg80211" as well?
Regards,
Arend
Stefan Wahren <[email protected]> writes:
> Am 15.03.2018 um 07:27 schrieb Rafa=C5=82 Mi=C5=82ecki:
>> On 14 March 2018 at 20:02, Stefan Wahren <[email protected]> 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 <[email protected]>
>> It sounds like it's worth a:
>> Fixes: <sha> ("regulatory: add NUL to request alpha2")
>
> I wasn't sure that i can take the hash from linux-next. I will add this.
Yeah, taking commit id from linux-next is not always safe. It depends on
the maintainer as some people never rebase and some do it quite often.
But in this case commit 657308f73e67 ("regulatory: add NUL to request
alpha2") is already in Linus' tree so the commit id won't change
anymore.
--=20
Kalle Valo