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

Commit 6bab27b6 authored by Felix Fietkau's avatar Felix Fietkau Committed by Greg Kroah-Hartman
Browse files

mac80211: allocate tailroom for forwarded mesh packets 



commit 51d0af222f6fa43134c6187ab4f374630f6e0d96 upstream.

Forwarded packets enter the tx path through ieee80211_add_pending_skb,
which skips the ieee80211_skb_resize call.
Fixes WARN_ON in ccmp_encrypt_skb and resulting packet loss.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0329973e

net/mac80211/rx.c

+6 −1
Original line number Diff line number Diff line
@@ -2598,6 +2598,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) 
	struct ieee80211_sub_if_data *sdata = rx->sdata;

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	u16 ac, q, hdrlen;

	int tailroom = 0;



	hdr = (struct ieee80211_hdr *) skb->data;

	hdrlen = ieee80211_hdrlen(hdr->frame_control);
@@ -2684,8 +2685,12 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) 
	if (!ifmsh->mshcfg.dot11MeshForwarding)

		goto out;



	if (sdata->crypto_tx_tailroom_needed_cnt)

		tailroom = IEEE80211_ENCRYPT_TAILROOM;



	fwd_skb = skb_copy_expand(skb, local->tx_headroom +

				       sdata->encrypt_headroom, 0, GFP_ATOMIC);

				       sdata->encrypt_headroom,

				  tailroom, GFP_ATOMIC);

	if (!fwd_skb)

		goto out;