Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751314AbcC3KJj (ORCPT ); Wed, 30 Mar 2016 06:09:39 -0400 Received: from mail-io0-f176.google.com ([209.85.223.176]:32784 "EHLO mail-io0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750975AbcC3KJi convert rfc822-to-8bit (ORCPT ); Wed, 30 Mar 2016 06:09:38 -0400 MIME-Version: 1.0 In-Reply-To: <1459332504-1718-1-git-send-email-wnhuang@chromium.org> References: <1459332504-1718-1-git-send-email-wnhuang@chromium.org> Date: Wed, 30 Mar 2016 18:09:29 +0800 Message-ID: Subject: Re: [PATCH] CHROMIUM: mwifiex: fix NULL pointer dereference error From: Wei-Ning Huang To: Linux Wireless Cc: LKML , Daniel Kurtz , snanda@chromium.org, Amitkumar Karwar , Wei-Ning Huang Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1379 Lines: 37 Sorry, please ignore this one. I forgot to strip the CHROMIUM: tag. Wei-Ning On Wed, Mar 30, 2016 at 6:08 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. > 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 > -- Wei-Ning Huang, 黃偉寧 | Software Engineer, Google Inc., Taiwan | wnhuang@google.com | Cell: +886 910-380678