2021-02-23 14:36:37

by Wei Yongjun

[permalink] [raw]
Subject: [PATCH] iwlwifi: mvm: add terminate entry for dmi_system_id tables

Make sure dmi_system_id tables are NULL terminated.

Fixes: a2ac0f48a07c ("iwlwifi: mvm: implement approved list for the PPAG feature")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 15e2773ce7e7..5ee64f7f3c85 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -1083,6 +1083,7 @@ static const struct dmi_system_id dmi_ppag_approved_list[] = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTek COMPUTER INC."),
},
},
+ {}
};

static int iwl_mvm_ppag_init(struct iwl_mvm *mvm)


2021-02-26 21:11:03

by Nathan Chancellor

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: mvm: add terminate entry for dmi_system_id tables

On Tue, Feb 23, 2021 at 02:00:39PM +0000, Wei Yongjun wrote:
> Make sure dmi_system_id tables are NULL terminated.
>
> Fixes: a2ac0f48a07c ("iwlwifi: mvm: implement approved list for the PPAG feature")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Wei Yongjun <[email protected]>

We received a report about a crash in iwlwifi when compiled with LTO and
this fix resolves it.

Reviewed-by: Nathan Chancellor <[email protected]>

> ---
> drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
> index 15e2773ce7e7..5ee64f7f3c85 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
> @@ -1083,6 +1083,7 @@ static const struct dmi_system_id dmi_ppag_approved_list[] = {
> DMI_MATCH(DMI_SYS_VENDOR, "ASUSTek COMPUTER INC."),
> },
> },
> + {}
> };
>
> static int iwl_mvm_ppag_init(struct iwl_mvm *mvm)
>

2021-02-26 21:40:13

by vic.michel.web

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: mvm: add terminate entry for dmi_system_id tables

This fixes a BUG triggered when loading the iwlwifi driver, which reproduces
consistently when I compile the kernel with LTO_CLANG_THIN.

Tested-by: Victor Michel <[email protected]>

2021-02-27 06:44:23

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: mvm: add terminate entry for dmi_system_id tables

Nathan Chancellor <[email protected]> writes:

> On Tue, Feb 23, 2021 at 02:00:39PM +0000, Wei Yongjun wrote:
>> Make sure dmi_system_id tables are NULL terminated.
>>
>> Fixes: a2ac0f48a07c ("iwlwifi: mvm: implement approved list for the PPAG feature")
>> Reported-by: Hulk Robot <[email protected]>
>> Signed-off-by: Wei Yongjun <[email protected]com>
>
> We received a report about a crash in iwlwifi when compiled with LTO and
> this fix resolves it.

That information should be added to the commit log.

Luca, should I take this to wireless-drivers?

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2021-03-04 07:25:35

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: mvm: add terminate entry for dmi_system_id tables

Jakub Kicinski <[email protected]> writes:

> On Tue, 2 Mar 2021 18:31:11 +0000 Coelho, Luciano wrote:
>> On Sat, 2021-02-27 at 08:39 +0200, Kalle Valo wrote:
>> > Nathan Chancellor <[email protected]> writes:
>> > > We received a report about a crash in iwlwifi when compiled with LTO and
>> > > this fix resolves it.
>> >
>> > That information should be added to the commit log.
>> >
>> > Luca, should I take this to wireless-drivers?
>>
>> I just saw Jens' patch now and I don't remember if I acked this one?
>>
>> In any, I assigned it to you in patchwork, so please take it directly
>> to w-d.
>>
>> Acked-by: Luca Coelho <[email protected]>
>
> Thanks, I'm getting pinged, too. It sounded like Kalle would like to
> see the commit log improved

I wrote my comment hastily, I was trying to say that I can add the crash
information to the commit log.

> if Wei doesn't respond could you please step in to make sure this
> fix is part of Dave's next PR to Linus?

Will do. Related to this, what's your pull request schedule to Linus
nowadays? Do you submit it every Thursday?

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2021-03-04 07:25:56

by Coelho, Luciano

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: mvm: add terminate entry for dmi_system_id tables

On Sat, 2021-02-27 at 08:39 +0200, Kalle Valo wrote:
> Nathan Chancellor <[email protected]> writes:
>
> > On Tue, Feb 23, 2021 at 02:00:39PM +0000, Wei Yongjun wrote:
> > > Make sure dmi_system_id tables are NULL terminated.
> > >
> > > Fixes: a2ac0f48a07c ("iwlwifi: mvm: implement approved list for the PPAG feature")
> > > Reported-by: Hulk Robot <[email protected]>
> > > Signed-off-by: Wei Yongjun <[email protected]>
> >
> > We received a report about a crash in iwlwifi when compiled with LTO and
> > this fix resolves it.
>
> That information should be added to the commit log.
>
> Luca, should I take this to wireless-drivers?

I just saw Jens' patch now and I don't remember if I acked this one?

In any, I assigned it to you in patchwork, so please take it directly
to w-d.

Thanks!

Acked-by: Luca Coelho <[email protected]>

--
Cheers,
Luca.

2021-03-04 07:25:57

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: mvm: add terminate entry for dmi_system_id tables

On Tue, 2 Mar 2021 18:31:11 +0000 Coelho, Luciano wrote:
> On Sat, 2021-02-27 at 08:39 +0200, Kalle Valo wrote:
> > Nathan Chancellor <[email protected]> writes:
> > > We received a report about a crash in iwlwifi when compiled with LTO and
> > > this fix resolves it.
> >
> > That information should be added to the commit log.
> >
> > Luca, should I take this to wireless-drivers?
>
> I just saw Jens' patch now and I don't remember if I acked this one?
>
> In any, I assigned it to you in patchwork, so please take it directly
> to w-d.
>
> Acked-by: Luca Coelho <[email protected]>

Thanks, I'm getting pinged, too. It sounded like Kalle would like to
see the commit log improved, if Wei doesn't respond could you please
step in to make sure this fix is part of Dave's next PR to Linus?

Thanks!

2021-03-04 07:27:52

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: mvm: add terminate entry for dmi_system_id tables

On Tue, 02 Mar 2021 21:50:18 +0200 Kalle Valo wrote:
> > if Wei doesn't respond could you please step in to make sure this
> > fix is part of Dave's next PR to Linus?
>
> Will do. Related to this, what's your pull request schedule to Linus
> nowadays? Do you submit it every Thursday?

Fair question :) Dave is back full time now, so I think it will be more
merit based again.

2021-03-04 12:37:50

by Coelho, Luciano

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: mvm: add terminate entry for dmi_system_id tables

On Tue, 2021-03-02 at 13:42 -0800, Jakub Kicinski wrote:
> On Tue, 02 Mar 2021 21:50:18 +0200 Kalle Valo wrote:
> > > if Wei doesn't respond could you please step in to make sure this
> > > fix is part of Dave's next PR to Linus?
> >
> > Will do. Related to this, what's your pull request schedule to Linus
> > nowadays? Do you submit it every Thursday?
>
> Fair question :) Dave is back full time now, so I think it will be more
> merit based again.

Great to hear! Welcome back Dave! :)

--
Cheers,
Luca.

2021-03-04 12:38:55

by Kalle Valo

[permalink] [raw]
Subject: Re: iwlwifi: mvm: add terminate entry for dmi_system_id tables

Wei Yongjun <[email protected]> wrote:

> Make sure dmi_system_id tables are NULL terminated. This crashed when LTO was enabled:
>
> BUG: KASAN: global-out-of-bounds in dmi_check_system+0x5a/0x70
> Read of size 1 at addr ffffffffc16af750 by task NetworkManager/1913
>
> CPU: 4 PID: 1913 Comm: NetworkManager Not tainted 5.12.0-rc1+ #10057
> Hardware name: LENOVO 20THCTO1WW/20THCTO1WW, BIOS N2VET27W (1.12 ) 12/21/2020
> Call Trace:
> dump_stack+0x90/0xbe
> print_address_description.constprop.0+0x1d/0x140
> ? dmi_check_system+0x5a/0x70
> ? dmi_check_system+0x5a/0x70
> kasan_report.cold+0x7b/0xd4
> ? dmi_check_system+0x5a/0x70
> __asan_load1+0x4d/0x50
> dmi_check_system+0x5a/0x70
> iwl_mvm_up+0x1360/0x1690 [iwlmvm]
> ? iwl_mvm_send_recovery_cmd+0x270/0x270 [iwlmvm]
> ? setup_object.isra.0+0x27/0xd0
> ? kasan_poison+0x20/0x50
> ? ___slab_alloc.constprop.0+0x483/0x5b0
> ? mempool_kmalloc+0x17/0x20
> ? ftrace_graph_ret_addr+0x2a/0xb0
> ? kasan_poison+0x3c/0x50
> ? cfg80211_iftype_allowed+0x2e/0x90 [cfg80211]
> ? __kasan_check_write+0x14/0x20
> ? mutex_lock+0x86/0xe0
> ? __mutex_lock_slowpath+0x20/0x20
> __iwl_mvm_mac_start+0x49/0x290 [iwlmvm]
> iwl_mvm_mac_start+0x37/0x50 [iwlmvm]
> drv_start+0x73/0x1b0 [mac80211]
> ieee80211_do_open+0x53e/0xf10 [mac80211]
> ? ieee80211_check_concurrent_iface+0x266/0x2e0 [mac80211]
> ieee80211_open+0xb9/0x100 [mac80211]
> __dev_open+0x1b8/0x280
>
> Fixes: a2ac0f48a07c ("iwlwifi: mvm: implement approved list for the PPAG feature")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Wei Yongjun <[email protected]>
> Reviewed-by: Nathan Chancellor <[email protected]>
> Tested-by: Victor Michel <[email protected]>
> Acked-by: Luca Coelho <[email protected]>
> [[email protected]: improve commit log]

Patch applied to wireless-drivers.git, thanks.

a22549f12767 iwlwifi: mvm: add terminate entry for dmi_system_id tables

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches