Commit baf3b3f2 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:

====================
1) Some constifications, from Mathias Krause.

2) Catch bugs if a hold timer is still active when xfrm_policy_destroy()
   is called, from Fan Du.

3) Remove a redundant address family checking, from Fan Du.

4) Make xfrm_state timer monotonic to be independent of system clock changes,
   from Fan Du.

5) Remove an outdated comment on returning -EREMOTE in the xfrm_lookup(),
   from Rami Rosen.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3bca8de2 e3fec5a1

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -1548,7 +1548,7 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net, u32 mark, u8, int dir, u32 
int xfrm_policy_flush(struct net *net, u8 type, struct xfrm_audit *audit_info);

u32 xfrm_get_acqseq(void);

extern int xfrm_alloc_spi(struct xfrm_state *x, u32 minspi, u32 maxspi);

struct xfrm_state *xfrm_find_acq(struct net *net, struct xfrm_mark *mark,

struct xfrm_state *xfrm_find_acq(struct net *net, const struct xfrm_mark *mark,

				 u8 mode, u32 reqid, u8 proto,

				 const xfrm_address_t *daddr,

				 const xfrm_address_t *saddr, int create,

net/key/af_key.c

+3 −11
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct netns_pfkey { 
static DEFINE_MUTEX(pfkey_mutex);



#define DUMMY_MARK 0

static struct xfrm_mark dummy_mark = {0, 0};

static const struct xfrm_mark dummy_mark = {0, 0};

struct pfkey_sock {

	/* struct sock must be the first member of struct pfkey_sock */

	struct sock	sk;
@@ -338,7 +338,7 @@ static int pfkey_error(const struct sadb_msg *orig, int err, struct sock *sk) 
	return 0;

}



static u8 sadb_ext_min_len[] = {

static const u8 sadb_ext_min_len[] = {

	[SADB_EXT_RESERVED]		= (u8) 0,

	[SADB_EXT_SA]			= (u8) sizeof(struct sadb_sa),

	[SADB_EXT_LIFETIME_CURRENT]	= (u8) sizeof(struct sadb_lifetime),
@@ -1196,10 +1196,6 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net, 


	x->props.family = pfkey_sadb_addr2xfrm_addr((struct sadb_address *) ext_hdrs[SADB_EXT_ADDRESS_SRC-1],

						    &x->props.saddr);

	if (!x->props.family) {

		err = -EAFNOSUPPORT;

		goto out;

	}

	pfkey_sadb_addr2xfrm_addr((struct sadb_address *) ext_hdrs[SADB_EXT_ADDRESS_DST-1],

				  &x->id.daddr);
@@ -2205,10 +2201,6 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, const struct sadb_ 


	sa = ext_hdrs[SADB_EXT_ADDRESS_SRC-1];

	xp->family = pfkey_sadb_addr2xfrm_addr(sa, &xp->selector.saddr);

	if (!xp->family) {

		err = -EINVAL;

		goto out;

	}

	xp->selector.family = xp->family;

	xp->selector.prefixlen_s = sa->sadb_address_prefixlen;

	xp->selector.proto = pfkey_proto_to_xfrm(sa->sadb_address_proto);
@@ -2737,7 +2729,7 @@ static int pfkey_spdflush(struct sock *sk, struct sk_buff *skb, const struct sad 


typedef int (*pfkey_handler)(struct sock *sk, struct sk_buff *skb,

			     const struct sadb_msg *hdr, void * const *ext_hdrs);

static pfkey_handler pfkey_funcs[SADB_MAX + 1] = {

static const pfkey_handler pfkey_funcs[SADB_MAX + 1] = {

	[SADB_RESERVED]		= pfkey_reserved,

	[SADB_GETSPI]		= pfkey_getspi,

	[SADB_UPDATE]		= pfkey_add,

net/xfrm/xfrm_policy.c

+1 −3
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ void xfrm_policy_destroy(struct xfrm_policy *policy) 
{

	BUG_ON(!policy->walk.dead);



	if (del_timer(&policy->timer))

	if (del_timer(&policy->timer) || del_timer(&policy->polq.hold_timer))

		BUG();



	security_xfrm_policy_free(policy->security);
@@ -2132,8 +2132,6 @@ restart: 
		 * have the xfrm_state's. We need to wait for KM to

		 * negotiate new SA's or bail out with error.*/

		if (net->xfrm.sysctl_larval_drop) {

			/* EREMOTE tells the caller to generate

			 * a one-shot blackhole route. */

			dst_release(dst);

			xfrm_pols_put(pols, drop_pols);

			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES);

net/xfrm/xfrm_state.c

+9 −6
Original line number Diff line number Diff line
@@ -499,7 +499,8 @@ struct xfrm_state *xfrm_state_alloc(struct net *net) 
		INIT_HLIST_NODE(&x->bydst);

		INIT_HLIST_NODE(&x->bysrc);

		INIT_HLIST_NODE(&x->byspi);

		tasklet_hrtimer_init(&x->mtimer, xfrm_timer_handler, CLOCK_REALTIME, HRTIMER_MODE_ABS);

		tasklet_hrtimer_init(&x->mtimer, xfrm_timer_handler,

					CLOCK_BOOTTIME, HRTIMER_MODE_ABS);

		setup_timer(&x->rtimer, xfrm_replay_timer_handler,

				(unsigned long)x);

		x->curlft.add_time = get_seconds();
@@ -990,11 +991,13 @@ void xfrm_state_insert(struct xfrm_state *x) 
EXPORT_SYMBOL(xfrm_state_insert);



/* xfrm_state_lock is held */

static struct xfrm_state *__find_acq_core(struct net *net, struct xfrm_mark *m,

static struct xfrm_state *__find_acq_core(struct net *net,

					  const struct xfrm_mark *m,

					  unsigned short family, u8 mode,

					  u32 reqid, u8 proto,

					  const xfrm_address_t *daddr,

					  const xfrm_address_t *saddr, int create)

					  const xfrm_address_t *saddr,

					  int create)

{

	unsigned int h = xfrm_dst_hash(net, daddr, saddr, reqid, family);

	struct xfrm_state *x;
@@ -1399,9 +1402,9 @@ xfrm_state_lookup_byaddr(struct net *net, u32 mark, 
EXPORT_SYMBOL(xfrm_state_lookup_byaddr);



struct xfrm_state *

xfrm_find_acq(struct net *net, struct xfrm_mark *mark, u8 mode, u32 reqid, u8 proto,

	      const xfrm_address_t *daddr, const xfrm_address_t *saddr,

	      int create, unsigned short family)

xfrm_find_acq(struct net *net, const struct xfrm_mark *mark, u8 mode, u32 reqid,

	      u8 proto, const xfrm_address_t *daddr,

	      const xfrm_address_t *saddr, int create, unsigned short family)

{

	struct xfrm_state *x;

CRA Git | Maintained and supported by SUSTech CRA and CCSE