OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4928bd2
)
cw1200: Fix OOPS in monitor mode
author
Solomon Peachy
<pizza@shaftnet.org>
Sat, 20 Jul 2013 03:31:27 +0000
(23:31 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Mon, 22 Jul 2013 20:04:08 +0000
(16:04 -0400)
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>
drivers/net/wireless/cw1200/txrx.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/cw1200/txrx.c
b/drivers/net/wireless/cw1200/txrx.c
index
5862c37
..
e824d4d
100644
(file)
--- 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;