Return-path: Received: from mail-vk0-f65.google.com ([209.85.213.65]:33092 "EHLO mail-vk0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751358AbcC3Kk4 convert rfc822-to-8bit (ORCPT ); Wed, 30 Mar 2016 06:40:56 -0400 MIME-Version: 1.0 Reply-To: sedat.dilek@gmail.com In-Reply-To: References: <1459332895-4563-1-git-send-email-wnhuang@chromium.org> Date: Wed, 30 Mar 2016 12:40:55 +0200 Message-ID: (sfid-20160330_124113_842731_8BC68C75) Subject: Re: [PATCH RESEND] mwifiex: fix NULL pointer dereference error From: Sedat Dilek To: Wei-Ning Huang Cc: Linux Wireless , LKML , Daniel Kurtz , snanda@chromium.org, Amitkumar Karwar , Kalle Valo Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Wed, Mar 30, 2016 at 12:38 PM, Wei-Ning Huang 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 wrote: >> 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 > > > > -- > Wei-Ning Huang, 黃偉寧 | Software Engineer, Google Inc., Taiwan | > wnhuang@google.com | Cell: +886 910-380678