]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
rtl8180: avoid potential NULL deref in rtl8180_beacon_work
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 5 Aug 2010 17:46:27 +0000 (13:46 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 13 Aug 2010 20:30:47 +0000 (13:30 -0700)
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>
drivers/net/wireless/rtl818x/rtl8180_dev.c

index 515817de29058483c25d00d7537de67fd9b8776a..15f09e81614eb3d4483ac28cc429e2377b412df9 100644 (file)
@@ -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