Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1367085

Re: [PATCH RESEND] mwifiex: fix NULL pointer dereference error

Show all headers | View raw

ah.. thanks.

Kalle, can you help amend the message if this patch is accepted?
Thanks a lot.

Wei-Ning

On Wed, Mar 30, 2016 at 6:26 PM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
> On Wed, Mar 30, 2016 at 12:14 PM, Wei-Ning Huang <wnhuang@chromium.org> wrote:
>> In mwifiex_enable_hs, we need to check if
>> priv->wdev.wiphy->wowlan_config is NULL before accessing it's member.
>
> it's... its member (not it's) :-).
>
> - Sedat -
>
>> This sometimes cause kernel panic when suspend/resume.
>>
>> Signed-off-by: Wei-Ning Huang <wnhuang@chromium.org>
>> ---
>>  drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
>> index d5c56eb..d8de432 100644
>> --- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
>> +++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
>> @@ -509,7 +509,8 @@ int mwifiex_enable_hs(struct mwifiex_adapter *adapter)
>>
>>         if (priv && priv->sched_scanning) {
>>  #ifdef CONFIG_PM
>> -               if (!priv->wdev.wiphy->wowlan_config->nd_config) {
>> +               if (priv->wdev.wiphy->wowlan_config &&
>> +                   !priv->wdev.wiphy->wowlan_config->nd_config) {
>>  #endif
>>                         mwifiex_dbg(adapter, CMD, "aborting bgscan!\n");
>>                         mwifiex_stop_bg_scan(priv);
>> --
>> 2.1.2
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Wei-Ning Huang, 黃偉寧 | Software Engineer, Google Inc., Taiwan |
wnhuang@google.com | Cell: +886 910-380678

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH RESEND] mwifiex: fix NULL pointer dereference error Wei-Ning Huang <wnhuang@chromium.org> - 2016-03-30 12:20 +0200
  Re: [PATCH RESEND] mwifiex: fix NULL pointer dereference error Sedat Dilek <sedat.dilek@gmail.com> - 2016-03-30 12:30 +0200
    Re: [PATCH RESEND] mwifiex: fix NULL pointer dereference error Wei-Ning Huang <wnhuang@google.com> - 2016-03-30 12:40 +0200
      Re: [PATCH RESEND] mwifiex: fix NULL pointer dereference error Sedat Dilek <sedat.dilek@gmail.com> - 2016-03-30 12:50 +0200
      Re: [PATCH RESEND] mwifiex: fix NULL pointer dereference error Kalle Valo <kvalo@codeaurora.org> - 2016-03-30 14:10 +0200
        Re: [PATCH RESEND] mwifiex: fix NULL pointer dereference error Wei-Ning Huang <wnhuang@google.com> - 2016-03-30 14:20 +0200

csiph-web