diff options
| author | Felix Fietkau <nbd@nbd.name> | 2023-03-24 13:09:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-29 17:30:55 +0200 |
| commit | 84de40083d7a900e49d3d6ced64ba6a37bd4226b (patch) | |
| tree | d13b11c604073f69257ed0176988c821568550f0 /net/mac80211 | |
| parent | 0cbe7032ce8ce54667987a299cccbafbcd8d7de8 (diff) | |
| download | linux-84de40083d7a900e49d3d6ced64ba6a37bd4226b.tar.gz linux-84de40083d7a900e49d3d6ced64ba6a37bd4226b.tar.bz2 linux-84de40083d7a900e49d3d6ced64ba6a37bd4226b.zip | |
wifi: mac80211: fix mesh forwarding
commit 8f0149a8ac59c12cd47271ac625c27dac5621d3a upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 5c115e15d207..3a5132dae19f 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2838,6 +2838,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)); |