From: Solomon Peachy <pizza@shaftnet.org>
Date: Sat, 20 Jul 2013 03:31:27 +0000 (-0400)
Subject: cw1200: Fix OOPS in monitor mode
X-Git-Tag: v3.11-rc4~22^2~25^2^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=16ec75b5de6479637993ad0f7c11a49aae069f68;p=~emulex%2Finfiniband.git

cw1200: Fix OOPS in monitor mode

In monitor mode, priv->vif is NULL, but at one point in the receive path we
blindly attempt to dereference it.  Add a test to prevent this.

Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/cw1200/txrx.c b/drivers/net/wireless/cw1200/txrx.c
index 5862c373d71..e824d4d4a18 100644
--- a/drivers/net/wireless/cw1200/txrx.c
+++ b/drivers/net/wireless/cw1200/txrx.c
@@ -1165,7 +1165,7 @@ void cw1200_rx_cb(struct cw1200_common *priv,
 		if (cw1200_handle_action_rx(priv, skb))
 			return;
 	} else if (ieee80211_is_beacon(frame->frame_control) &&
-		   !arg->status &&
+		   !arg->status && priv->vif &&
 		   !memcmp(ieee80211_get_SA(frame), priv->vif->bss_conf.bssid,
 			   ETH_ALEN)) {
 		const u8 *tim_ie;