diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-05 19:46:27 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-05 22:05:27 +0200 |
| commit | 8f1d2d2be73a98c21e68fe2a26f633892d4abdd1 (patch) | |
| tree | 347a1a6a0621a151151590fd4baa22dcff1c8c35 /drivers/net | |
| parent | ath9k: Remove myself from the MAINTAINERS list (diff) | |
| download | linux-8f1d2d2be73a98c21e68fe2a26f633892d4abdd1.tar.xz linux-8f1d2d2be73a98c21e68fe2a26f633892d4abdd1.zip | |
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
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180_dev.c | 2 |
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 1d8178563d76..b50c39aaec05 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 |