From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 5 Aug 2010 17:46:27 +0000 (-0400)
Subject: rtl8180: avoid potential NULL deref in rtl8180_beacon_work
X-Git-Tag: v2.6.35.2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3c5501ec90af293e011b036e9c5871b300d304e;p=thirdparty%2Fkernel%2Fstable.git

rtl8180: avoid potential NULL deref in rtl8180_beacon_work

commit 8f1d2d2be73a98c21e68fe2a26f633892d4abdd1 upstream.

ieee80211_beacon_get can return NULL...

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 515817de29058..15f09e81614eb 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -688,6 +688,8 @@ 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