linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH RESEND] mwifiex: fix NULL pointer dereference error
@ 2016-03-30 10:14 Wei-Ning Huang
  2016-03-30 10:26 ` Sedat Dilek
  2016-04-07 16:40 ` [RESEND] " Kalle Valo
  0 siblings, 2 replies; 7+ messages in thread
From: Wei-Ning Huang @ 2016-03-30 10:14 UTC (permalink / raw)
  To: Linux Wireless; +Cc: LKML, djkurtz, snanda, akarwar, Wei-Ning Huang

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 <wnhuang@chromium.org>
---
 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


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2016-04-07 16:40 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-30 10:14 [PATCH RESEND] mwifiex: fix NULL pointer dereference error Wei-Ning Huang
2016-03-30 10:26 ` Sedat Dilek
2016-03-30 10:38   ` Wei-Ning Huang
2016-03-30 10:40     ` Sedat Dilek
2016-03-30 12:00     ` Kalle Valo
2016-03-30 12:11       ` Wei-Ning Huang
2016-04-07 16:40 ` [RESEND] " Kalle Valo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).