diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-09 16:16:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-03 18:24:41 -0600 |
| commit | 82f9455a53ee8c02320c6a3b3c74975b804b9df0 (patch) | |
| tree | 6d0c9391f56ad0a858f6361e02e538d987ecbcb7 | |
| parent | fb259496950eaa9fa104ec6e570595ed21d66b07 (diff) | |
| download | linux-3.10-82f9455a53ee8c02320c6a3b3c74975b804b9df0.tar.gz linux-3.10-82f9455a53ee8c02320c6a3b3c74975b804b9df0.tar.bz2 linux-3.10-82f9455a53ee8c02320c6a3b3c74975b804b9df0.zip | |
ath9k: fix double-free bug on beacon generate failure
commit 1adb2e2b5f85023d17eb4f95386a57029df27c88 upstream.
When the next beacon is sent, the ath_buf from the previous run is reused.
If getting a new beacon from mac80211 fails, bf->bf_mpdu is not reset, yet
the skb is freed, leading to a double-free on the next beacon tx attempt,
resulting in a system crash.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/beacon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c index 5eb53c98d75..2e4243fcadc 100644 --- a/drivers/net/wireless/ath/ath9k/beacon.c +++ b/drivers/net/wireless/ath/ath9k/beacon.c @@ -154,6 +154,7 @@ static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw, skb->len, DMA_TO_DEVICE); dev_kfree_skb_any(skb); bf->bf_buf_addr = 0; + bf->bf_mpdu = NULL; } /* Get a new beacon from mac80211 */ |