Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dce4b005 authored by Chih-Kang Chang's avatar Chih-Kang Chang Committed by Greg Kroah-Hartman
Browse files

mac80211: Fix insufficient headroom issue for AMSDU 



[ Upstream commit f50d2ff8f016b79a2ff4acd5943a1eda40c545d4 ]

ieee80211_amsdu_realloc_pad() fails to account for extra_tx_headroom,
the original reserved headroom might be eaten. Add the necessary
extra_tx_headroom.

Fixes: 6e0456b5 ("mac80211: add A-MSDU tx support")
Signed-off-by: default avatarChih-Kang Chang <gary.chang@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Link: https://lore.kernel.org/r/20210816085128.10931-2-pkshih@realtek.com


[fix indentation]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5e2d2f05

net/mac80211/tx.c

+3 −1
Original line number Diff line number Diff line
@@ -3142,7 +3142,9 @@ 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));