Commit d55c670c authored by Alexander Duyck's avatar Alexander Duyck Committed by Steffen Klassert

ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call

The vti6_rcv_cb and vti_rcv_cb calls were leaving the skb->mark modified
after completing the function.  This resulted in the original skb->mark
value being lost.  Since we only need skb->mark to be set for
xfrm_policy_check we can pull the assignment into the rcv_cb calls and then
just restore the original mark after xfrm_policy_check has been completed.
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 049f8e2e
...@@ -65,7 +65,6 @@ static int vti_input(struct sk_buff *skb, int nexthdr, __be32 spi, ...@@ -65,7 +65,6 @@ static int vti_input(struct sk_buff *skb, int nexthdr, __be32 spi,
goto drop; goto drop;
XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4 = tunnel; XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4 = tunnel;
skb->mark = be32_to_cpu(tunnel->parms.i_key);
return xfrm_input(skb, nexthdr, spi, encap_type); return xfrm_input(skb, nexthdr, spi, encap_type);
} }
...@@ -91,6 +90,8 @@ static int vti_rcv_cb(struct sk_buff *skb, int err) ...@@ -91,6 +90,8 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)
struct pcpu_sw_netstats *tstats; struct pcpu_sw_netstats *tstats;
struct xfrm_state *x; struct xfrm_state *x;
struct ip_tunnel *tunnel = XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4; struct ip_tunnel *tunnel = XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4;
u32 orig_mark = skb->mark;
int ret;
if (!tunnel) if (!tunnel)
return 1; return 1;
...@@ -107,7 +108,11 @@ static int vti_rcv_cb(struct sk_buff *skb, int err) ...@@ -107,7 +108,11 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)
x = xfrm_input_state(skb); x = xfrm_input_state(skb);
family = x->inner_mode->afinfo->family; family = x->inner_mode->afinfo->family;
if (!xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family)) skb->mark = be32_to_cpu(tunnel->parms.i_key);
ret = xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family);
skb->mark = orig_mark;
if (!ret)
return -EPERM; return -EPERM;
skb_scrub_packet(skb, !net_eq(tunnel->net, dev_net(skb->dev))); skb_scrub_packet(skb, !net_eq(tunnel->net, dev_net(skb->dev)));
......
...@@ -322,7 +322,6 @@ static int vti6_rcv(struct sk_buff *skb) ...@@ -322,7 +322,6 @@ static int vti6_rcv(struct sk_buff *skb)
} }
XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6 = t; XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6 = t;
skb->mark = be32_to_cpu(t->parms.i_key);
rcu_read_unlock(); rcu_read_unlock();
...@@ -342,6 +341,8 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err) ...@@ -342,6 +341,8 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)
struct pcpu_sw_netstats *tstats; struct pcpu_sw_netstats *tstats;
struct xfrm_state *x; struct xfrm_state *x;
struct ip6_tnl *t = XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6; struct ip6_tnl *t = XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6;
u32 orig_mark = skb->mark;
int ret;
if (!t) if (!t)
return 1; return 1;
...@@ -358,7 +359,11 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err) ...@@ -358,7 +359,11 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)
x = xfrm_input_state(skb); x = xfrm_input_state(skb);
family = x->inner_mode->afinfo->family; family = x->inner_mode->afinfo->family;
if (!xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family)) skb->mark = be32_to_cpu(t->parms.i_key);
ret = xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family);
skb->mark = orig_mark;
if (!ret)
return -EPERM; return -EPERM;
skb_scrub_packet(skb, !net_eq(t->net, dev_net(skb->dev))); skb_scrub_packet(skb, !net_eq(t->net, dev_net(skb->dev)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment