Commit b0fcee82 authored by Steffen Klassert's avatar Steffen Klassert
Browse files

xfrm: Add a secpath_set helper. 



Add a new helper to set the secpath to the skb.
This avoids code duplication, as this is used
in multiple places.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 37b10383

include/net/xfrm.h

+1 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,7 @@ secpath_put(struct sec_path *sp) 
}



struct sec_path *secpath_dup(struct sec_path *src);

int secpath_set(struct sk_buff *skb);



static inline void

secpath_reset(struct sk_buff *skb)

net/ipv6/xfrm6_input.c

+3 −12
Original line number Diff line number Diff line
@@ -69,19 +69,10 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr, 
	struct xfrm_state *x = NULL;

	int i = 0;



	/* Allocate new secpath or COW existing one. */

	if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {

		struct sec_path *sp;



		sp = secpath_dup(skb->sp);

		if (!sp) {

	if (secpath_set(skb)) {

		XFRM_INC_STATS(net, LINUX_MIB_XFRMINERROR);

		goto drop;

	}

		if (skb->sp)

			secpath_put(skb->sp);

		skb->sp = sp;

	}



	if (1 + skb->sp->len == XFRM_MAX_DEPTH) {

		XFRM_INC_STATS(net, LINUX_MIB_XFRMINBUFFERERROR);

net/xfrm/xfrm_input.c

+22 −12
Original line number Diff line number Diff line
@@ -117,6 +117,24 @@ struct sec_path *secpath_dup(struct sec_path *src) 
}

EXPORT_SYMBOL(secpath_dup);



int secpath_set(struct sk_buff *skb)

{

	struct sec_path *sp;



	/* Allocate new secpath or COW existing one. */

	if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {

		sp = secpath_dup(skb->sp);

		if (!sp)

			return -ENOMEM;



		if (skb->sp)

			secpath_put(skb->sp);

		skb->sp = sp;

	}

	return 0;

}

EXPORT_SYMBOL(secpath_set);



/* Fetch spi and seq from ipsec header */



int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq)
@@ -212,19 +230,11 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type) 
		break;

	}



	/* Allocate new secpath or COW existing one. */

	if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {

		struct sec_path *sp;



		sp = secpath_dup(skb->sp);

		if (!sp) {

	err = secpath_set(skb);

	if (err) {

		XFRM_INC_STATS(net, LINUX_MIB_XFRMINERROR);

		goto drop;

	}

		if (skb->sp)

			secpath_put(skb->sp);

		skb->sp = sp;

	}



	seq = 0;

	if (!spi && (err = xfrm_parse_spi(skb, nexthdr, &spi, &seq)) != 0) {