Commit 4b1d488a authored Sep 26, 2016 by Yotam Gigi Committed by David S. Miller Sep 27, 2016

act_ife: Fix external mac header on encode



On ife encode side, external mac header is copied from the original packet
and may be overridden if the user requests. Before, the mac header copy
was done from memory region that might not be accessible anymore, as
skb_cow_head might free it and copy the packet. This led to random values
in the external mac header once the values were not set by user.

This fix takes the internal mac header from the packet, after the call to
skb_cow_head.

Fixes: ef6980b6 ("net sched: introduce IFE action")
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Yotam Gigi <yotamg@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1190cfdb

net/sched/act_ife.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -740,8 +740,6 @@ static int tcf_ife_encode(struct sk_buff skb, const struct tc_action a,
		return TC_ACT_SHOT;
		}

		iethh = eth_hdr(skb);

		err = skb_cow_head(skb, hdrm);
		if (unlikely(err)) {
		ife->tcf_qstats.drops++;
		@@ -752,6 +750,7 @@ static int tcf_ife_encode(struct sk_buff skb, const struct tc_action a,
		if (!(at & AT_EGRESS))
		skb_push(skb, skb->dev->hard_header_len);

		iethh = (struct ethhdr *)skb->data;
		__skb_push(skb, hdrm);
		memcpy(skb->data, iethh, skb->mac_len);
		skb_reset_mac_header(skb);

Admin message