2017-01-11 14:54:19

by Cedric Izoard

Subject: mac80211: Fix headroom allocation when forwarding mesh pkt

This patch fix issue introduced by commit
"mac80211: Ensure enough headroom when forwarding mesh pkt"

When forwarding mesh pkt, mac80211 may also add security header,
and it must therefore be taken into account in the needed headroom.

Signed-off-by: Cedric Izoard <[email protected]>
---
net/mac80211/rx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index c037c5b..e376093 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2472,7 +2472,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
if (!ifmsh->mshcfg.dot11MeshForwarding)
goto out;

- fwd_skb = skb_copy_expand(skb, local->tx_headroom, 0, GFP_ATOMIC);
+ fwd_skb = skb_copy_expand(skb, local->tx_headroom +
+ sdata->encrypt_headroom, 0, GFP_ATOMIC);
if (!fwd_skb) {
net_info_ratelimited("%s: failed to clone mesh frame\n",
sdata->name);
--
2.7.4

2017-01-11 15:08:59

by Johannes Berg

Subject: Re: mac80211: Fix headroom allocation when forwarding mesh pkt

On Wed, 2017-01-11 at 14:39 +0000, Cedric Izoard wrote:
> This patch fix issue introduced by commit
> "mac80211: Ensure enough headroom when forwarding mesh pkt"

I reworded that, and replaced the commit reference with a Fixes: tag,
please try to do that in the future.

Applied, but I also reindented that to match the expression.

johannes

2017-01-12 02:40:44

by Masashi Honma

Subject: Re: mac80211: Fix headroom allocation when forwarding mesh pkt

On 2017/01/11 23:39, Cedric Izoard wrote:
> - fwd_skb = skb_copy_expand(skb, local->tx_headroom, 0, GFP_ATOMIC);
> + fwd_skb = skb_copy_expand(skb, local->tx_headroom +
> + sdata->encrypt_headroom, 0, GFP_ATOMIC);
> if (!fwd_skb) {
> net_info_ratelimited("%s: failed to clone mesh frame\n",
> sdata->name);
>

# I retransmit this because of server error.

Thanks ! It work for me.

Bisected-reported-and-tested-by: Masashi Honma <[email protected]>

Masashi Honma.