]> git.itanic.dy.fi Git - linux-stable/commit
net/sched: act_vlan: Push skb->data to mac_header prior calling skb_vlan_*() functions
authorShmulik Ladkani <shmulik.ladkani@gmail.com>
Thu, 29 Sep 2016 09:10:40 +0000 (12:10 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Oct 2016 01:40:50 +0000 (21:40 -0400)
commitf39acc84aad10710e89835c60d3b6694c43a8dd9
tree13b0d222768776fbff3cf1a7b2bc63ccfa851c10
parentf814bfd765218908b23e21ca7f0b6f403fb88972
net/sched: act_vlan: Push skb->data to mac_header prior calling skb_vlan_*() functions

Generic skb_vlan_push/skb_vlan_pop functions don't properly handle the
case where the input skb data pointer does not point at the mac header:

- They're doing push/pop, but fail to properly unwind data back to its
  original location.
  For example, in the skb_vlan_push case, any subsequent
  'skb_push(skb, skb->mac_len)' calls make the skb->data point 4 bytes
  BEFORE start of frame, leading to bogus frames that may be transmitted.

- They update rcsum per the added/removed 4 bytes tag.
  Alas if data is originally after the vlan/eth headers, then these
  bytes were already pulled out of the csum.

OTOH calling skb_vlan_push/skb_vlan_pop with skb->data at mac_header
present no issues.

act_vlan is the only caller to skb_vlan_*() that has skb->data pointing
at network header (upon ingress).
Other calles (ovs, bpf) already adjust skb->data at mac_header.

This patch fixes act_vlan to point to the mac_header prior calling
skb_vlan_*() functions, as other callers do.

Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Pravin Shelar <pshelar@ovn.org>
Cc: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/act_vlan.c