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

Commit ac68a3d3 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-next 



Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2018-12-20

Two last patches for this release cycle:

1) Remove an unused variable in xfrm_policy_lookup_bytype().
   From YueHaibing.

2) Fix possible infinite loop in __xfrm6_tunnel_alloc_spi().
   Also from YueHaibing.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a9cd3439 fa89a459

net/ipv6/xfrm6_tunnel.c

+3 −0
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ static u32 __xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr) 
		index = __xfrm6_tunnel_spi_check(net, spi);

		if (index >= 0)

			goto alloc_spi;



		if (spi == XFRM6_TUNNEL_SPI_MAX)

			break;

	}

	for (spi = XFRM6_TUNNEL_SPI_MIN; spi < xfrm6_tn->spi; spi++) {

		index = __xfrm6_tunnel_spi_check(net, spi);

net/xfrm/xfrm_policy.c

+0 −3
Original line number Diff line number Diff line
@@ -2076,7 +2076,6 @@ static struct xfrm_policy *xfrm_policy_lookup_bytype(struct net *net, u8 type, 
	struct xfrm_policy *pol, *ret;

	struct hlist_head *chain;

	unsigned int sequence;

	u32 priority;

	int err;



	daddr = xfrm_flowi_daddr(fl, family);
@@ -2091,7 +2090,6 @@ static struct xfrm_policy *xfrm_policy_lookup_bytype(struct net *net, u8 type, 
		chain = policy_hash_direct(net, daddr, saddr, family, dir);

	} while (read_seqcount_retry(&xfrm_policy_hash_generation, sequence));



	priority = ~0U;

	ret = NULL;

	hlist_for_each_entry_rcu(pol, chain, bydst) {

		err = xfrm_policy_match(pol, fl, type, family, dir, if_id);
@@ -2104,7 +2102,6 @@ static struct xfrm_policy *xfrm_policy_lookup_bytype(struct net *net, u8 type, 
			}

		} else {

			ret = pol;

			priority = ret->priority;

			break;

		}

	}