2016-03-30 10:15:08

by Wei-Ning Huang

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

In mwifiex_enable_hs, we need to check if
priv->wdev.wiphy->wowlan_config is NULL before accessing it's member.
This sometimes cause kernel panic when suspend/resume.

Signed-off-by: Wei-Ning Huang <[email protected]>
---
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

2016-03-30 10:39:02

by Wei-Ning Huang

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

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 <[email protected]> wrote:
> On Wed, Mar 30, 2016 at 12:14 PM, Wei-Ning Huang <[email protected]> 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 <[email protected]>
>> ---
>> 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 [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html



--
Wei-Ning Huang, 黃偉寧 | Software Engineer, Google Inc., Taiwan |
[email protected] | Cell: +886 910-380678

2016-03-30 12:12:09

by Wei-Ning Huang

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

On Wed, Mar 30, 2016 at 8:00 PM, Kalle Valo <[email protected]> wrote:
> Wei-Ning Huang <[email protected]> writes:
>
>> Kalle, can you help amend the message if this patch is accepted?
>
> Sure, I'll fix the typo in the commit log.
>
> But please try to avoid top posting, it makes it more difficult to
> follow the threads.
>
> --
> Kalle Valo

Noted, thanks for the reminder :)

Wei-Ning


--
Wei-Ning Huang, 黃偉寧 | Software Engineer, Google Inc., Taiwan |
[email protected] | Cell: +886 910-380678

2016-03-30 10:26:38

by Sedat Dilek

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

On Wed, Mar 30, 2016 at 12:14 PM, Wei-Ning Huang <[email protected]> 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 <[email protected]>
> ---
> 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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2016-03-30 12:00:30

by Kalle Valo

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

Wei-Ning Huang <[email protected]> writes:

> Kalle, can you help amend the message if this patch is accepted?

Sure, I'll fix the typo in the commit log.

But please try to avoid top posting, it makes it more difficult to
follow the threads.

--
Kalle Valo

2016-03-30 10:40:56

by Sedat Dilek

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

On Wed, Mar 30, 2016 at 12:38 PM, Wei-Ning Huang <[email protected]> wrote:
> ah.. thanks.
>
> Kalle, can you help amend the message if this patch is accepted?
> Thanks a lot.
>

http://its-not-its.info/

- Sedat -

> Wei-Ning
>
> On Wed, Mar 30, 2016 at 6:26 PM, Sedat Dilek <[email protected]> wrote:
>> On Wed, Mar 30, 2016 at 12:14 PM, Wei-Ning Huang <[email protected]> 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 <[email protected]>
>>> ---
>>> 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 [email protected]
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
> --
> Wei-Ning Huang, 黃偉寧 | Software Engineer, Google Inc., Taiwan |
> [email protected] | Cell: +886 910-380678

2016-04-07 16:40:56

by Kalle Valo

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

> In mwifiex_enable_hs, we need to check if
> priv->wdev.wiphy->wowlan_config is NULL before accessing its member.
> This sometimes cause kernel panic when suspend/resume.
>
> Signed-off-by: Wei-Ning Huang <[email protected]>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo