Commit c38c39bf authored Jan 11, 2017 by Cedric Izoard Committed by Johannes Berg Jan 11, 2017

mac80211: Fix headroom allocation when forwarding mesh pkt



This patch fix issue introduced by my previous commit that
tried to ensure enough headroom was present, and instead
broke it.

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

Fixes: d8da0b5d ("mac80211: Ensure enough headroom when forwarding mesh pkt")
Signed-off-by: Cedric Izoard <cedric.izoard@ceva-dsp.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent eeb0d56f

net/mac80211/rx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message