wifi: mac80211: fix mesh forwarding

nbd168 · jmberg-intel · commit 8f0149a8ac59 · 2023-03-30T11:19:53.000+02:00
Linearize packets (needed for forwarding A-MSDU subframes). Fixes: 986e43b ("wifi: mac80211: fix receiving A-MSDU frames on mesh interfaces") Signed-off-by: Felix Fietkau <nbd@nbd.name> Link: https://lore.kernel.org/r/20230324120924.38412-1-nbd@nbd.name Signed-off-by: Johannes Berg <johannes.berg@intel.com>
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
@@ -2833,6 +2833,9 @@ ieee80211_rx_mesh_data(struct ieee80211_sub_if_data *sdata, struct sta_info *sta
 
 		if (skb_cow_head(fwd_skb, hdrlen - sizeof(struct ethhdr)))
 			return RX_DROP_UNUSABLE;
+
+		if (skb_linearize(fwd_skb))
+			return RX_DROP_UNUSABLE;
 	}
 
 	fwd_hdr = skb_push(fwd_skb, hdrlen - sizeof(struct ethhdr));

Original file line number	Diff line number	Diff line change
`@@ -2833,6 +2833,9 @@ ieee80211_rx_mesh_data(struct ieee80211_sub_if_data sdata, struct sta_info sta`
`2833`	`2833`
`2834`	`2834`	`if (skb_cow_head(fwd_skb, hdrlen - sizeof(struct ethhdr)))`
`2835`	`2835`	`return RX_DROP_UNUSABLE;`
	`2836`	`+`
	`2837`	`+ if (skb_linearize(fwd_skb))`
	`2838`	`+ return RX_DROP_UNUSABLE;`
`2836`	`2839`	`}`
`2837`	`2840`
`2838`	`2841`	`fwd_hdr = skb_push(fwd_skb, hdrlen - sizeof(struct ethhdr));`