diff mbox series

[2/2] mac80211: Fix insufficient headroom issue for AMSDU

Message ID 20210816085128.10931-2-pkshih@realtek.com
State New
Headers show
Series None | expand

Commit Message

Ping-Ke Shih Aug. 16, 2021, 8:51 a.m. UTC 
From: Chih-Kang Chang <gary.chang@realtek.com>

ieee80211_amsdu_realloc_pad() lacks some check for extra_tx_headroom,
the original reserved headroom might be eaten. So we add the
extra_tx_headroom check.

Fixes: 6e0456b54545 ("mac80211: add A-MSDU tx support")
Signed-off-by: Chih-Kang Chang <gary.chang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
 net/mac80211/tx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 9e0d4fca1c76..a69dc58d9768 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3242,7 +3242,8 @@  static bool ieee80211_amsdu_prepare_head(struct ieee80211_sub_if_data *sdata,
 	if (info->control.flags & IEEE80211_TX_CTRL_AMSDU)
 		return true;
 
-	if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(*amsdu_hdr)))
+	if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(*amsdu_hdr) +
+					 local->hw.extra_tx_headroom))
 		return false;
 
 	data = skb_push(skb, sizeof(*amsdu_hdr));