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

Commit dbe5b4aa authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPSEC]: Kill unused decap state structure 



This patch removes the *_decap_state structures which were previously
used to share state between input/post_input.  This is no longer
needed.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e695633e

include/net/xfrm.h

+1 −16
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo); 


extern void xfrm_state_delete_tunnel(struct xfrm_state *x);



struct xfrm_decap_state;

struct xfrm_type

{

	char			*description;
@@ -606,25 +605,11 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) 


extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev);



/* Decapsulation state, used by the input to store data during

 * decapsulation procedure, to be used later (during the policy

 * check

 */

struct xfrm_decap_state {

	char	decap_data[20];

	__u16	decap_type;

};   



struct sec_decap_state {

	struct xfrm_state	*xvec;

	struct xfrm_decap_state decap;

};



struct sec_path

{

	atomic_t		refcnt;

	int			len;

	struct sec_decap_state	x[XFRM_MAX_DEPTH];

	struct xfrm_state	*xvec[XFRM_MAX_DEPTH];

};



static inline struct sec_path *

net/ipv4/xfrm4_input.c

+5 −5
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type) 
{

	int err;

	u32 spi, seq;

	struct sec_decap_state xfrm_vec[XFRM_MAX_DEPTH];

	struct xfrm_state *xfrm_vec[XFRM_MAX_DEPTH];

	struct xfrm_state *x;

	int xfrm_nr = 0;

	int decaps = 0;
@@ -99,7 +99,6 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type) 
		if (xfrm_state_check_expire(x))

			goto drop_unlock;



		xfrm_vec[xfrm_nr].decap.decap_type = encap_type;

		if (x->type->input(x, skb))

			goto drop_unlock;
@@ -114,7 +113,7 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type) 


		spin_unlock(&x->lock);



		xfrm_vec[xfrm_nr++].xvec = x;

		xfrm_vec[xfrm_nr++] = x;



		iph = skb->nh.iph;
@@ -156,7 +155,8 @@ int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type) 
	if (xfrm_nr + skb->sp->len > XFRM_MAX_DEPTH)

		goto drop;



	memcpy(skb->sp->x+skb->sp->len, xfrm_vec, xfrm_nr*sizeof(struct sec_decap_state));

	memcpy(skb->sp->xvec + skb->sp->len, xfrm_vec,

	       xfrm_nr * sizeof(xfrm_vec[0]));

	skb->sp->len += xfrm_nr;



	nf_reset(skb);
@@ -187,7 +187,7 @@ drop_unlock: 
	xfrm_state_put(x);

drop:

	while (--xfrm_nr >= 0)

		xfrm_state_put(xfrm_vec[xfrm_nr].xvec);

		xfrm_state_put(xfrm_vec[xfrm_nr]);



	kfree_skb(skb);

	return 0;

net/ipv6/xfrm6_input.c

+5 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi) 
{

	int err;

	u32 seq;

	struct sec_decap_state xfrm_vec[XFRM_MAX_DEPTH];

	struct xfrm_state *xfrm_vec[XFRM_MAX_DEPTH];

	struct xfrm_state *x;

	int xfrm_nr = 0;

	int decaps = 0;
@@ -79,7 +79,7 @@ int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi) 


		spin_unlock(&x->lock);



		xfrm_vec[xfrm_nr++].xvec = x;

		xfrm_vec[xfrm_nr++] = x;



		if (x->props.mode) { /* XXX */

			if (nexthdr != IPPROTO_IPV6)
@@ -118,7 +118,8 @@ int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi) 
	if (xfrm_nr + skb->sp->len > XFRM_MAX_DEPTH)

		goto drop;



	memcpy(skb->sp->x+skb->sp->len, xfrm_vec, xfrm_nr*sizeof(struct sec_decap_state));

	memcpy(skb->sp->xvec + skb->sp->len, xfrm_vec,

	       xfrm_nr * sizeof(xfrm_vec[0]));

	skb->sp->len += xfrm_nr;

	skb->ip_summed = CHECKSUM_NONE;
@@ -149,7 +150,7 @@ drop_unlock: 
	xfrm_state_put(x);

drop:

	while (--xfrm_nr >= 0)

		xfrm_state_put(xfrm_vec[xfrm_nr].xvec);

		xfrm_state_put(xfrm_vec[xfrm_nr]);

	kfree_skb(skb);

	return -1;

}

net/netfilter/xt_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ match_policy_in(const struct sk_buff *skb, const struct xt_policy_info *info, 
			return 0;

		e = &info->pol[pos];



		if (match_xfrm_state(sp->x[i].xvec, e, family)) {

		if (match_xfrm_state(sp->xvec[i], e, family)) {

			if (!strict)

				return 1;

		} else if (strict)

net/xfrm/xfrm_input.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ void __secpath_destroy(struct sec_path *sp) 
{

	int i;

	for (i = 0; i < sp->len; i++)

		xfrm_state_put(sp->x[i].xvec);

		xfrm_state_put(sp->xvec[i]);

	kmem_cache_free(secpath_cachep, sp);

}

EXPORT_SYMBOL(__secpath_destroy);
@@ -37,7 +37,7 @@ struct sec_path *secpath_dup(struct sec_path *src) 


		memcpy(sp, src, sizeof(*sp));

		for (i = 0; i < sp->len; i++)

			xfrm_state_hold(sp->x[i].xvec);

			xfrm_state_hold(sp->xvec[i]);

	}

	atomic_set(&sp->refcnt, 1);

	return sp;