summaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2023-03-24 13:09:22 +0100
committerJohannes Berg <johannes.berg@intel.com>2023-03-30 11:19:53 +0200
commit8f0149a8ac59c12cd47271ac625c27dac5621d3a (patch)
treef8921ab6ad225e382949c80b961f9822cdf33994 /net/mac80211/rx.c
parentwifi: mac80211: fix receiving mesh packets in forwarding=0 networks (diff)
downloadlinux-8f0149a8ac59c12cd47271ac625c27dac5621d3a.tar.xz
linux-8f0149a8ac59c12cd47271ac625c27dac5621d3a.zip
wifi: mac80211: fix mesh forwarding
Linearize packets (needed for forwarding A-MSDU subframes). Fixes: 986e43b19ae9 ("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>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 7bd5aa2d5a95..10efa429e946 100644
--- 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));