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

From: Sedat Dilek
Date: Wed Mar 30 2016 - 06:26:43 EST


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