Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfcf92c2 authored by Alexander Duyck's avatar Alexander Duyck Committed by Sasha Levin
Browse files

xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_input 



[ Upstream commit 049f8e2e28d9c3dac0744cc2f19d3157c7fb5646 ]

This change makes it so that if a tunnel is defined we just use the mark
from the tunnel instead of the mark from the skb header.  By doing this we
can avoid the need to set skb->mark inside of the tunnel receive functions.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 5508c260

net/xfrm/xfrm_input.c

+16 −1
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <net/dst.h>

#include <net/ip.h>

#include <net/xfrm.h>

#include <net/ip_tunnels.h>

#include <net/ip6_tunnel.h>



static struct kmem_cache *secpath_cachep __read_mostly;
@@ -186,6 +188,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) 
	struct xfrm_state *x = NULL;

	xfrm_address_t *daddr;

	struct xfrm_mode *inner_mode;

	u32 mark = skb->mark;

	unsigned int family;

	int decaps = 0;

	int async = 0;
@@ -203,6 +206,18 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) 
				   XFRM_SPI_SKB_CB(skb)->daddroff);

	family = XFRM_SPI_SKB_CB(skb)->family;



	/* if tunnel is present override skb->mark value with tunnel i_key */

	if (XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4) {

		switch (family) {

		case AF_INET:

			mark = be32_to_cpu(XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4->parms.i_key);

			break;

		case AF_INET6:

			mark = be32_to_cpu(XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6->parms.i_key);

			break;

		}

	}



	/* Allocate new secpath or COW existing one. */

	if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {

		struct sec_path *sp;
@@ -229,7 +244,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) 
			goto drop;

		}



		x = xfrm_state_lookup(net, skb->mark, daddr, spi, nexthdr, family);

		x = xfrm_state_lookup(net, mark, daddr, spi, nexthdr, family);

		if (x == NULL) {

			XFRM_INC_STATS(net, LINUX_MIB_XFRMINNOSTATES);

			xfrm_audit_state_notfound(skb, family, spi, seq);