summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-08-05 13:46:27 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-05 16:05:27 -0400
commit8f1d2d2be73a98c21e68fe2a26f633892d4abdd1 (patch)
tree347a1a6a0621a151151590fd4baa22dcff1c8c35
parentc5d2711cb508ff8bc76d88fe442d1c27fb136245 (diff)
rtl8180: avoid potential NULL deref in rtl8180_beacon_workmaster-2010-08-05
ieee80211_beacon_get can return NULL... Signed-off-by: John W. Linville <linville@tuxdriver.com> Cc: stable@kernel.org
-rw-r--r--drivers/net/wireless/rtl818x/rtl8180_dev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 1d8178563d7..b50c39aaec0 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -695,6 +695,8 @@ static void rtl8180_beacon_work(struct work_struct *work)
/* grab a fresh beacon */
skb = ieee80211_beacon_get(dev, vif);
+ if (!skb)
+ goto resched;
/*
* update beacon timestamp w/ TSF value