Commit f59bbdfa authored Sep 27, 2013 by Fan Du Committed by Steffen Klassert Oct 01, 2013

xfrm: Simplify SA looking up when using wildcard source



__xfrm4/6_state_addr_check is a four steps check, all we need to do
is checking whether the destination address match when looking SA
using wildcard source address. Passing saddr from flow is worst option,
as the checking needs to reach the fourth step while actually only
one time checking will do the work.

So, simplify this process by only checking destination address when
using wildcard source address for looking up SAs.

Signed-off-by: Fan Du <fan.du@windriver.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent 6f115638

net/xfrm/xfrm_state.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -824,7 +824,7 @@ xfrm_state_find(const xfrm_address_t daddr, const xfrm_address_t saddr,
		x->props.reqid == tmpl->reqid &&
		(mark & x->mark.m) == x->mark.v &&
		!(x->props.flags & XFRM_STATE_WILDRECV) &&
		xfrm_state_addr_check(x, daddr, saddr, encap_family) &&
		xfrm_addr_equal(&x->id.daddr, daddr, encap_family) &&
		tmpl->mode == x->props.mode &&
		tmpl->id.proto == x->id.proto &&
		(tmpl->id.spi == x->id.spi \|\| !tmpl->id.spi))

Admin message