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

Commit 634d8ee4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec 



Steffen Klassert says:

====================
pull request (net): ipsec 2015-04-09

1) We dereferenced the xfrm outer_mode too early, larval
   SAs don't have it set. Move the dereference of the
   outer mode below the larval SA check to fix it.
   From Alexey Dobriyan.

2) Fix vti6 tunnel uninit on namespace crosssing.
   From Yao Xiwei.

Please pull or let me know if there are problems.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 11f17ef3 092a29a4

net/ipv6/ip6_vti.c

+1 −2
Original line number Diff line number Diff line
@@ -288,8 +288,7 @@ static struct ip6_tnl *vti6_locate(struct net *net, struct __ip6_tnl_parm *p, 
static void vti6_dev_uninit(struct net_device *dev)

{

	struct ip6_tnl *t = netdev_priv(dev);

	struct net *net = dev_net(dev);

	struct vti6_net *ip6n = net_generic(net, vti6_net_id);

	struct vti6_net *ip6n = net_generic(t->net, vti6_net_id);



	if (dev == ip6n->fb_tnl_dev)

		RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);

net/xfrm/xfrm_input.c

+5 −5
Original line number Diff line number Diff line
@@ -238,11 +238,6 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) 


		skb->sp->xvec[skb->sp->len++] = x;



		if (xfrm_tunnel_check(skb, x, family)) {

			XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATEMODEERROR);

			goto drop;

		}



		spin_lock(&x->lock);

		if (unlikely(x->km.state == XFRM_STATE_ACQ)) {

			XFRM_INC_STATS(net, LINUX_MIB_XFRMACQUIREERROR);
@@ -271,6 +266,11 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) 


		spin_unlock(&x->lock);



		if (xfrm_tunnel_check(skb, x, family)) {

			XFRM_INC_STATS(net, LINUX_MIB_XFRMINSTATEMODEERROR);

			goto drop;

		}



		seq_hi = htonl(xfrm_replay_seqhi(x, seq));



		XFRM_SKB_CB(skb)->seq.input.low = seq;