commit 8f1d2d2be73a98c21e68fe2a26f633892d4abdd1
author John W. Linville <linville@tuxdriver.com> Thu Aug 05 13:46:27 2010 -0400
committer John W. Linville <linville@tuxdriver.com> Thu Aug 05 16:05:27 2010 -0400
tree 347a1a6a0621a151151590fd4baa22dcff1c8c35
parent c5d2711cb508ff8bc76d88fe442d1c27fb136245

rtl8180: avoid potential NULL deref in rtl8180_beacon_work

ieee80211_beacon_get can return NULL...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Cc: stable@kernel.org

drivers/net/wireless/rtl818x/rtl8180_dev.c

diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 1d81785..b50c39a 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -695,6 +695,8 @@
 
 	/* grab a fresh beacon */
 	skb = ieee80211_beacon_get(dev, vif);
+	if (!skb)
+		goto resched;
 
 	/*
 	 * update beacon timestamp w/ TSF value