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

Commit 26b15dad authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

[IPSEC] Add complete xfrm event notification 



Heres the final patch.
What this patch provides

- netlink xfrm events
- ability to have events generated by netlink propagated to pfkey
  and vice versa.
- fixes the acquire lets-be-happy-with-one-success issue

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3aa3dfb3

include/linux/xfrm.h

+2 −0
Original line number Diff line number Diff line
@@ -257,5 +257,7 @@ struct xfrm_usersa_flush { 


#define XFRMGRP_ACQUIRE		1

#define XFRMGRP_EXPIRE		2

#define XFRMGRP_SA		4

#define XFRMGRP_POLICY		8



#endif /* _LINUX_XFRM_H */

include/net/xfrm.h

+26 −3
Original line number Diff line number Diff line
@@ -158,6 +158,27 @@ enum { 
	XFRM_STATE_DEAD

};



/* events that could be sent by kernel */

enum {

	XFRM_SAP_INVALID,

	XFRM_SAP_EXPIRED,

	XFRM_SAP_ADDED,

	XFRM_SAP_UPDATED,

	XFRM_SAP_DELETED,

	XFRM_SAP_FLUSHED,

	__XFRM_SAP_MAX

};

#define XFRM_SAP_MAX (__XFRM_SAP_MAX - 1)



/* callback structure passed from either netlink or pfkey */

struct km_event

{

	u32	data;

	u32	seq;

	u32	pid;

	u32	event;

};



struct xfrm_type;

struct xfrm_dst;

struct xfrm_policy_afinfo {
@@ -179,6 +200,8 @@ struct xfrm_policy_afinfo { 


extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);

extern int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);

extern void km_policy_notify(struct xfrm_policy *xp, int dir, struct km_event *c);

extern void km_state_notify(struct xfrm_state *x, struct km_event *c);



#define XFRM_ACQ_EXPIRES	30
@@ -290,11 +313,11 @@ struct xfrm_mgr 
{

	struct list_head	list;

	char			*id;

	int			(*notify)(struct xfrm_state *x, int event);

	int			(*notify)(struct xfrm_state *x, struct km_event *c);

	int			(*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir);

	struct xfrm_policy	*(*compile_policy)(u16 family, int opt, u8 *data, int len, int *dir);

	int			(*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport);

	int			(*notify_policy)(struct xfrm_policy *x, int dir, int event);

	int			(*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c);

};



extern int xfrm_register_km(struct xfrm_mgr *km);
@@ -817,7 +840,7 @@ extern int xfrm_state_add(struct xfrm_state *x); 
extern int xfrm_state_update(struct xfrm_state *x);

extern struct xfrm_state *xfrm_state_lookup(xfrm_address_t *daddr, u32 spi, u8 proto, unsigned short family);

extern struct xfrm_state *xfrm_find_acq_byseq(u32 seq);

extern void xfrm_state_delete(struct xfrm_state *x);

extern int xfrm_state_delete(struct xfrm_state *x);

extern void xfrm_state_flush(u8 proto);

extern int xfrm_replay_check(struct xfrm_state *x, u32 seq);

extern void xfrm_replay_advance(struct xfrm_state *x, u32 seq);

net/key/af_key.c

+267 −90
Original line number Diff line number Diff line
@@ -1240,13 +1240,85 @@ static int pfkey_acquire(struct sock *sk, struct sk_buff *skb, struct sadb_msg * 
	return 0;

}



static inline int event2poltype(int event)

{

	switch (event) {

	case XFRM_SAP_DELETED:

		return SADB_X_SPDDELETE;

	case XFRM_SAP_ADDED:

		return SADB_X_SPDADD;

	case XFRM_SAP_UPDATED:

		return SADB_X_SPDUPDATE;

	case XFRM_SAP_EXPIRED:

	//	return SADB_X_SPDEXPIRE;

	default:

		printk("pfkey: Unknown policy event %d\n", event);

		break;

	}



	return 0;

}



static inline int event2keytype(int event)

{

	switch (event) {

	case XFRM_SAP_DELETED:

		return SADB_DELETE;

	case XFRM_SAP_ADDED:

		return SADB_ADD;

	case XFRM_SAP_UPDATED:

		return SADB_UPDATE;

	case XFRM_SAP_EXPIRED:

		return SADB_EXPIRE;

	default:

		printk("pfkey: Unknown SA event %d\n", event);

		break;

	}



	return 0;

}



/* ADD/UPD/DEL */

static int key_notify_sa(struct xfrm_state *x, struct km_event *c)

{

	struct sk_buff *skb;

	struct sadb_msg *hdr;

	int hsc = 3;



	if (c->event == XFRM_SAP_DELETED)

		hsc = 0;



	if (c->event == XFRM_SAP_EXPIRED) {

		if (c->data)

			hsc = 2;

		else

			hsc = 1;

	}



	skb = pfkey_xfrm_state2msg(x, 0, hsc);



	if (IS_ERR(skb))

		return PTR_ERR(skb);



	hdr = (struct sadb_msg *) skb->data;

	hdr->sadb_msg_version = PF_KEY_V2;

	hdr->sadb_msg_type = event2keytype(c->event);

	hdr->sadb_msg_satype = pfkey_proto2satype(x->id.proto);

	hdr->sadb_msg_errno = 0;

	hdr->sadb_msg_reserved = 0;

	hdr->sadb_msg_seq = c->seq;

	hdr->sadb_msg_pid = c->pid;



	pfkey_broadcast(skb, GFP_ATOMIC, BROADCAST_ALL, NULL);



	return 0;

}



static int pfkey_add(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, void **ext_hdrs)

{

	struct sk_buff *out_skb;

	struct sadb_msg *out_hdr;

	struct xfrm_state *x;

	int err;

	struct km_event c;



	xfrm_probe_algs();
@@ -1254,6 +1326,7 @@ static int pfkey_add(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, 
	if (IS_ERR(x))

		return PTR_ERR(x);



	xfrm_state_hold(x);

	if (hdr->sadb_msg_type == SADB_ADD)

		err = xfrm_state_add(x);

	else
@@ -1265,27 +1338,23 @@ static int pfkey_add(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, 
		return err;

	}



	out_skb = pfkey_xfrm_state2msg(x, 0, 3);

	if (IS_ERR(out_skb))

		return  PTR_ERR(out_skb); /* XXX Should we return 0 here ? */



	out_hdr = (struct sadb_msg *) out_skb->data;

	out_hdr->sadb_msg_version = hdr->sadb_msg_version;

	out_hdr->sadb_msg_type = hdr->sadb_msg_type;

	out_hdr->sadb_msg_satype = pfkey_proto2satype(x->id.proto);

	out_hdr->sadb_msg_errno = 0;

	out_hdr->sadb_msg_reserved = 0;

	out_hdr->sadb_msg_seq = hdr->sadb_msg_seq;

	out_hdr->sadb_msg_pid = hdr->sadb_msg_pid;



	pfkey_broadcast(out_skb, GFP_ATOMIC, BROADCAST_ALL, sk);

	if (hdr->sadb_msg_type == SADB_ADD)

		c.event = XFRM_SAP_ADDED;

	else

		c.event = XFRM_SAP_UPDATED;

	c.seq = hdr->sadb_msg_seq;

	c.pid = hdr->sadb_msg_pid;

	km_state_notify(x, &c);

	xfrm_state_put(x);



	return 0;

	return err;

}



static int pfkey_delete(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, void **ext_hdrs)

{

	struct xfrm_state *x;

	struct km_event c;

	int err;



	if (!ext_hdrs[SADB_EXT_SA-1] ||

	    !present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC-1],
@@ -1301,13 +1370,19 @@ static int pfkey_delete(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h 
		return -EPERM;

	}

	

	xfrm_state_delete(x);

	err = xfrm_state_delete(x);

	if (err < 0) {

		xfrm_state_put(x);

		return err;

	}



	pfkey_broadcast(skb_clone(skb, GFP_KERNEL), GFP_KERNEL, 

			BROADCAST_ALL, sk);

	c.seq = hdr->sadb_msg_seq;

	c.pid = hdr->sadb_msg_pid;

	c.event = XFRM_SAP_DELETED;

	km_state_notify(x, &c);

	xfrm_state_put(x);



	return 0;

	return err;

}



static int pfkey_get(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, void **ext_hdrs)
@@ -1445,28 +1520,42 @@ static int pfkey_register(struct sock *sk, struct sk_buff *skb, struct sadb_msg 
	return 0;

}



static int key_notify_sa_flush(struct km_event *c)

{

	struct sk_buff *skb;

	struct sadb_msg *hdr;



	skb = alloc_skb(sizeof(struct sadb_msg) + 16, GFP_ATOMIC);

	if (!skb)

		return -ENOBUFS;

	hdr = (struct sadb_msg *) skb_put(skb, sizeof(struct sadb_msg));

	hdr->sadb_msg_satype = pfkey_proto2satype(c->data);

	hdr->sadb_msg_seq = c->seq;

	hdr->sadb_msg_pid = c->pid;

	hdr->sadb_msg_version = PF_KEY_V2;

	hdr->sadb_msg_errno = (uint8_t) 0;

	hdr->sadb_msg_len = (sizeof(struct sadb_msg) / sizeof(uint64_t));



	pfkey_broadcast(skb, GFP_ATOMIC, BROADCAST_ALL, NULL);



	return 0;

}



static int pfkey_flush(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, void **ext_hdrs)

{

	unsigned proto;

	struct sk_buff *skb_out;

	struct sadb_msg *hdr_out;

	struct km_event c;



	proto = pfkey_satype2proto(hdr->sadb_msg_satype);

	if (proto == 0)

		return -EINVAL;



	skb_out = alloc_skb(sizeof(struct sadb_msg) + 16, GFP_KERNEL);

	if (!skb_out)

		return -ENOBUFS;



	xfrm_state_flush(proto);



	hdr_out = (struct sadb_msg *) skb_put(skb_out, sizeof(struct sadb_msg));

	pfkey_hdr_dup(hdr_out, hdr);

	hdr_out->sadb_msg_errno = (uint8_t) 0;

	hdr_out->sadb_msg_len = (sizeof(struct sadb_msg) / sizeof(uint64_t));



	pfkey_broadcast(skb_out, GFP_KERNEL, BROADCAST_ALL, NULL);

	c.data = proto;

	c.seq = hdr->sadb_msg_seq;

	c.pid = hdr->sadb_msg_pid;

	c.event = XFRM_SAP_FLUSHED;

	km_state_notify(NULL, &c);



	return 0;

}
@@ -1859,6 +1948,35 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i 
	hdr->sadb_msg_reserved = atomic_read(&xp->refcnt);

}



static int key_notify_policy(struct xfrm_policy *xp, int dir, struct km_event *c)

{

	struct sk_buff *out_skb;

	struct sadb_msg *out_hdr;

	int err;



	out_skb = pfkey_xfrm_policy2msg_prep(xp);

	if (IS_ERR(out_skb)) {

		err = PTR_ERR(out_skb);

		goto out;

	}

	pfkey_xfrm_policy2msg(out_skb, xp, dir);



	out_hdr = (struct sadb_msg *) out_skb->data;

	out_hdr->sadb_msg_version = PF_KEY_V2;



	if (c->data && c->event == XFRM_SAP_DELETED)

		out_hdr->sadb_msg_type = SADB_X_SPDDELETE2;

	else

		out_hdr->sadb_msg_type = event2poltype(c->event);

	out_hdr->sadb_msg_errno = 0;

	out_hdr->sadb_msg_seq = c->seq;

	out_hdr->sadb_msg_pid = c->pid;

	pfkey_broadcast(out_skb, GFP_ATOMIC, BROADCAST_ALL, NULL);

out:

	return 0;



}



static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, void **ext_hdrs)

{

	int err;
@@ -1866,8 +1984,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h 
	struct sadb_address *sa;

	struct sadb_x_policy *pol;

	struct xfrm_policy *xp;

	struct sk_buff *out_skb;

	struct sadb_msg *out_hdr;

	struct km_event c;



	if (!present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC-1],

				     ext_hdrs[SADB_EXT_ADDRESS_DST-1]) ||
@@ -1935,31 +2052,23 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h 
	    (err = parse_ipsecrequests(xp, pol)) < 0)

		goto out;



	out_skb = pfkey_xfrm_policy2msg_prep(xp);

	if (IS_ERR(out_skb)) {

		err =  PTR_ERR(out_skb);

		goto out;

	}



	err = xfrm_policy_insert(pol->sadb_x_policy_dir-1, xp,

				 hdr->sadb_msg_type != SADB_X_SPDUPDATE);

	if (err) {

		kfree_skb(out_skb);

		goto out;

		kfree(xp);

		return err;

	}



	pfkey_xfrm_policy2msg(out_skb, xp, pol->sadb_x_policy_dir-1);

	if (hdr->sadb_msg_type == SADB_X_SPDUPDATE)

		c.event = XFRM_SAP_UPDATED;

	else

		c.event = XFRM_SAP_ADDED;



	xfrm_pol_put(xp);

	c.seq = hdr->sadb_msg_seq;

	c.pid = hdr->sadb_msg_pid;



	out_hdr = (struct sadb_msg *) out_skb->data;

	out_hdr->sadb_msg_version = hdr->sadb_msg_version;

	out_hdr->sadb_msg_type = hdr->sadb_msg_type;

	out_hdr->sadb_msg_satype = 0;

	out_hdr->sadb_msg_errno = 0;

	out_hdr->sadb_msg_seq = hdr->sadb_msg_seq;

	out_hdr->sadb_msg_pid = hdr->sadb_msg_pid;

	pfkey_broadcast(out_skb, GFP_ATOMIC, BROADCAST_ALL, sk);

	km_policy_notify(xp, pol->sadb_x_policy_dir-1, &c);

	xfrm_pol_put(xp);

	return 0;



out:
@@ -1973,9 +2082,8 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg 
	struct sadb_address *sa;

	struct sadb_x_policy *pol;

	struct xfrm_policy *xp;

	struct sk_buff *out_skb;

	struct sadb_msg *out_hdr;

	struct xfrm_selector sel;

	struct km_event c;



	if (!present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC-1],

				     ext_hdrs[SADB_EXT_ADDRESS_DST-1]) ||
@@ -2010,25 +2118,40 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg 


	err = 0;



	c.seq = hdr->sadb_msg_seq;

	c.pid = hdr->sadb_msg_pid;

	c.event = XFRM_SAP_DELETED;

	km_policy_notify(xp, pol->sadb_x_policy_dir-1, &c);



	xfrm_pol_put(xp);

	return err;

}



static int key_pol_get_resp(struct sock *sk, struct xfrm_policy *xp, struct sadb_msg *hdr, int dir)

{

	int err;

	struct sk_buff *out_skb;

	struct sadb_msg *out_hdr;

	err = 0;



	out_skb = pfkey_xfrm_policy2msg_prep(xp);

	if (IS_ERR(out_skb)) {

		err =  PTR_ERR(out_skb);

		goto out;

	}

	pfkey_xfrm_policy2msg(out_skb, xp, pol->sadb_x_policy_dir-1);

	pfkey_xfrm_policy2msg(out_skb, xp, dir);



	out_hdr = (struct sadb_msg *) out_skb->data;

	out_hdr->sadb_msg_version = hdr->sadb_msg_version;

	out_hdr->sadb_msg_type = SADB_X_SPDDELETE;

	out_hdr->sadb_msg_type = hdr->sadb_msg_type;

	out_hdr->sadb_msg_satype = 0;

	out_hdr->sadb_msg_errno = 0;

	out_hdr->sadb_msg_seq = hdr->sadb_msg_seq;

	out_hdr->sadb_msg_pid = hdr->sadb_msg_pid;

	pfkey_broadcast(out_skb, GFP_ATOMIC, BROADCAST_ALL, sk);

	pfkey_broadcast(out_skb, GFP_ATOMIC, BROADCAST_ONE, sk);

	err = 0;



out:

	xfrm_pol_put(xp);

	return err;

}
@@ -2037,8 +2160,7 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h 
	int err;

	struct sadb_x_policy *pol;

	struct xfrm_policy *xp;

	struct sk_buff *out_skb;

	struct sadb_msg *out_hdr;

	struct km_event c;



	if ((pol = ext_hdrs[SADB_X_EXT_POLICY-1]) == NULL)

		return -EINVAL;
@@ -2050,24 +2172,16 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h 


	err = 0;



	out_skb = pfkey_xfrm_policy2msg_prep(xp);

	if (IS_ERR(out_skb)) {

		err =  PTR_ERR(out_skb);

		goto out;

	c.seq = hdr->sadb_msg_seq;

	c.pid = hdr->sadb_msg_pid;

	if (hdr->sadb_msg_type == SADB_X_SPDDELETE2) {

		c.data = 1; // to signal pfkey of SADB_X_SPDDELETE2

		c.event = XFRM_SAP_DELETED;

		km_policy_notify(xp, pol->sadb_x_policy_dir-1, &c);

	} else {

		err = key_pol_get_resp(sk, xp, hdr, pol->sadb_x_policy_dir-1);

	}

	pfkey_xfrm_policy2msg(out_skb, xp, pol->sadb_x_policy_dir-1);



	out_hdr = (struct sadb_msg *) out_skb->data;

	out_hdr->sadb_msg_version = hdr->sadb_msg_version;

	out_hdr->sadb_msg_type = hdr->sadb_msg_type;

	out_hdr->sadb_msg_satype = 0;

	out_hdr->sadb_msg_errno = 0;

	out_hdr->sadb_msg_seq = hdr->sadb_msg_seq;

	out_hdr->sadb_msg_pid = hdr->sadb_msg_pid;

	pfkey_broadcast(out_skb, GFP_ATOMIC, BROADCAST_ALL, sk);

	err = 0;



out:

	xfrm_pol_put(xp);

	return err;

}
@@ -2102,22 +2216,34 @@ static int pfkey_spddump(struct sock *sk, struct sk_buff *skb, struct sadb_msg * 
	return xfrm_policy_walk(dump_sp, &data);

}



static int pfkey_spdflush(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, void **ext_hdrs)

static int key_notify_policy_flush(struct km_event *c)

{

	struct sk_buff *skb_out;

	struct sadb_msg *hdr_out;

	struct sadb_msg *hdr;



	skb_out = alloc_skb(sizeof(struct sadb_msg) + 16, GFP_KERNEL);

	skb_out = alloc_skb(sizeof(struct sadb_msg) + 16, GFP_ATOMIC);

	if (!skb_out)

		return -ENOBUFS;

	hdr = (struct sadb_msg *) skb_put(skb_out, sizeof(struct sadb_msg));

	hdr->sadb_msg_seq = c->seq;

	hdr->sadb_msg_pid = c->pid;

	hdr->sadb_msg_version = PF_KEY_V2;

	hdr->sadb_msg_errno = (uint8_t) 0;

	hdr->sadb_msg_len = (sizeof(struct sadb_msg) / sizeof(uint64_t));

	pfkey_broadcast(skb_out, GFP_ATOMIC, BROADCAST_ALL, NULL);

	return 0;



	xfrm_policy_flush();

}



	hdr_out = (struct sadb_msg *) skb_put(skb_out, sizeof(struct sadb_msg));

	pfkey_hdr_dup(hdr_out, hdr);

	hdr_out->sadb_msg_errno = (uint8_t) 0;

	hdr_out->sadb_msg_len = (sizeof(struct sadb_msg) / sizeof(uint64_t));

	pfkey_broadcast(skb_out, GFP_KERNEL, BROADCAST_ALL, NULL);

static int pfkey_spdflush(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, void **ext_hdrs)

{

	struct km_event c;



	xfrm_policy_flush();

	c.event = XFRM_SAP_FLUSHED;

	c.pid = hdr->sadb_msg_pid;

	c.seq = hdr->sadb_msg_seq;

	km_policy_notify(NULL, 0, &c);



	return 0;

}
@@ -2317,11 +2443,23 @@ static void dump_esp_combs(struct sk_buff *skb, struct xfrm_tmpl *t) 
	}

}



static int pfkey_send_notify(struct xfrm_state *x, int hard)

static int key_notify_policy_expire(struct xfrm_policy *xp, struct km_event *c)

{

	return 0;

}



static int key_notify_sa_expire(struct xfrm_state *x, struct km_event *c)

{

	struct sk_buff *out_skb;

	struct sadb_msg *out_hdr;

	int hsc = (hard ? 2 : 1);

	int hard;

	int hsc;



	hard = c->data;

	if (hard)

		hsc = 2;

	else

		hsc = 1;



	out_skb = pfkey_xfrm_state2msg(x, 0, hsc);

	if (IS_ERR(out_skb))
@@ -2340,6 +2478,44 @@ static int pfkey_send_notify(struct xfrm_state *x, int hard) 
	return 0;

}



static int pfkey_send_notify(struct xfrm_state *x, struct km_event *c)

{

	switch (c->event) {

	case XFRM_SAP_EXPIRED:

		return key_notify_sa_expire(x, c);

	case XFRM_SAP_DELETED:

	case XFRM_SAP_ADDED:

	case XFRM_SAP_UPDATED:

		return key_notify_sa(x, c);

	case XFRM_SAP_FLUSHED:

		return key_notify_sa_flush(c);

	default:

		printk("pfkey: Unknown SA event %d\n", c->event);

		break;

	}



	return 0;

}



static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, struct km_event *c)

{

	switch (c->event) {

	case XFRM_SAP_EXPIRED:

		return key_notify_policy_expire(xp, c);

	case XFRM_SAP_DELETED:

	case XFRM_SAP_ADDED:

	case XFRM_SAP_UPDATED:

		return key_notify_policy(xp, dir, c);

	case XFRM_SAP_FLUSHED:

		return key_notify_policy_flush(c);

	default:

		printk("pfkey: Unknown policy event %d\n", c->event);

		break;

	}



	return 0;

}



static u32 get_acqseq(void)

{

	u32 res;
@@ -2856,6 +3032,7 @@ static struct xfrm_mgr pfkeyv2_mgr = 
	.acquire	= pfkey_send_acquire,

	.compile_policy	= pfkey_compile_policy,

	.new_mapping	= pfkey_send_new_mapping,

	.notify_policy	= pfkey_send_policy_notify,

};



static void __exit ipsec_pfkey_exit(void)

net/xfrm/xfrm_state.c

+54 −20
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static DEFINE_SPINLOCK(xfrm_state_gc_lock); 


static int xfrm_state_gc_flush_bundles;



static void __xfrm_state_delete(struct xfrm_state *x);

static int __xfrm_state_delete(struct xfrm_state *x);



static struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned short family);

static void xfrm_state_put_afinfo(struct xfrm_state_afinfo *afinfo);
@@ -215,8 +215,10 @@ void __xfrm_state_destroy(struct xfrm_state *x) 
}

EXPORT_SYMBOL(__xfrm_state_destroy);



static void __xfrm_state_delete(struct xfrm_state *x)

static int __xfrm_state_delete(struct xfrm_state *x)

{

	int err = -ESRCH;



	if (x->km.state != XFRM_STATE_DEAD) {

		x->km.state = XFRM_STATE_DEAD;

		spin_lock(&xfrm_state_lock);
@@ -245,14 +247,21 @@ static void __xfrm_state_delete(struct xfrm_state *x) 
		 * is what we are dropping here.

		 */

		atomic_dec(&x->refcnt);

		err = 0;

	}



	return err;

}



void xfrm_state_delete(struct xfrm_state *x)

int xfrm_state_delete(struct xfrm_state *x)

{

	int err;



	spin_lock_bh(&x->lock);

	__xfrm_state_delete(x);

	err = __xfrm_state_delete(x);

	spin_unlock_bh(&x->lock);



	return err;

}

EXPORT_SYMBOL(xfrm_state_delete);
@@ -796,34 +805,60 @@ EXPORT_SYMBOL(xfrm_replay_advance); 
static struct list_head xfrm_km_list = LIST_HEAD_INIT(xfrm_km_list);

static DEFINE_RWLOCK(xfrm_km_lock);



static void km_state_expired(struct xfrm_state *x, int hard)

void km_policy_notify(struct xfrm_policy *xp, int dir, struct km_event *c)

{

	struct xfrm_mgr *km;



	if (hard)

		x->km.state = XFRM_STATE_EXPIRED;

	else

		x->km.dying = 1;

	read_lock(&xfrm_km_lock);

	list_for_each_entry(km, &xfrm_km_list, list)

		if (km->notify_policy)

			km->notify_policy(xp, dir, c);

	read_unlock(&xfrm_km_lock);

}



void km_state_notify(struct xfrm_state *x, struct km_event *c)

{

	struct xfrm_mgr *km;

	read_lock(&xfrm_km_lock);

	list_for_each_entry(km, &xfrm_km_list, list)

		km->notify(x, hard);

		if (km->notify)

			km->notify(x, c);

	read_unlock(&xfrm_km_lock);

}



EXPORT_SYMBOL(km_policy_notify);

EXPORT_SYMBOL(km_state_notify);



static void km_state_expired(struct xfrm_state *x, int hard)

{

	struct km_event c;



	if (hard)

		x->km.state = XFRM_STATE_EXPIRED;

	else

		x->km.dying = 1;

	c.data = hard;

	c.event = XFRM_SAP_EXPIRED;

	km_state_notify(x, &c);



	if (hard)

		wake_up(&km_waitq);

}



/*

 * We send to all registered managers regardless of failure

 * We are happy with one success

*/

static int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol)

{

	int err = -EINVAL;

	int err = -EINVAL, acqret;

	struct xfrm_mgr *km;



	read_lock(&xfrm_km_lock);

	list_for_each_entry(km, &xfrm_km_list, list) {

		err = km->acquire(x, t, pol, XFRM_POLICY_OUT);

		if (!err)

			break;

		acqret = km->acquire(x, t, pol, XFRM_POLICY_OUT);

		if (!acqret)

			err = acqret;

	}

	read_unlock(&xfrm_km_lock);

	return err;
@@ -848,13 +883,12 @@ EXPORT_SYMBOL(km_new_mapping); 


void km_policy_expired(struct xfrm_policy *pol, int dir, int hard)

{

	struct xfrm_mgr *km;

	struct km_event c;



	read_lock(&xfrm_km_lock);

	list_for_each_entry(km, &xfrm_km_list, list)

		if (km->notify_policy)

			km->notify_policy(pol, dir, hard);

	read_unlock(&xfrm_km_lock);

	c.data = hard;

	c.data = hard;

	c.event = XFRM_SAP_EXPIRED;

	km_policy_notify(pol, dir, &c);



	if (hard)

		wake_up(&km_waitq);

net/xfrm/xfrm_user.c

+267 −5

File changed.

Preview size limit exceeded, changes collapsed.