Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751393AbcC3K0k (ORCPT ); Wed, 30 Mar 2016 06:26:40 -0400 Received: from mail-vk0-f66.google.com ([209.85.213.66]:34435 "EHLO mail-vk0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751008AbcC3K0i (ORCPT ); Wed, 30 Mar 2016 06:26:38 -0400 MIME-Version: 1.0 Reply-To: sedat.dilek@gmail.com In-Reply-To: <1459332895-4563-1-git-send-email-wnhuang@chromium.org> References: <1459332895-4563-1-git-send-email-wnhuang@chromium.org> Date: Wed, 30 Mar 2016 12:26:37 +0200 Message-ID: Subject: Re: [PATCH RESEND] mwifiex: fix NULL pointer dereference error From: Sedat Dilek To: Wei-Ning Huang Cc: Linux Wireless , LKML , djkurtz@chromium.org, snanda@chromium.org, akarwar@marvell.com Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1436 Lines: 36 On Wed, Mar 30, 2016 at 12:14 PM, Wei-Ning Huang 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 > --- > 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