Commit 75e252d9 authored Mar 12, 2007 by Joy Latten Committed by David S. Miller Mar 12, 2007

[XFRM]: Fix missing protocol comparison of larval SAs.



I noticed that in xfrm_state_add we look for the larval SA in a few
places without checking for protocol match. So when using both 
AH and ESP, whichever one gets added first, deletes the larval SA. 
It seems AH always gets added first and ESP is always the larval 
SA's protocol since the xfrm->tmpl has it first. Thus causing the
additional km_query()

Adding the check eliminates accidental double SA creation. 

Signed-off-by: Joy Latten <latten@austin.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ce0ecd59

net/xfrm/xfrm_state.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -704,7 +704,8 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re
		x->props.mode != mode \|\|
		x->props.family != family \|\|
		x->km.state != XFRM_STATE_ACQ \|\|
		x->id.spi != 0)
		x->id.spi != 0 \|\|
		x->id.proto != proto)
		continue;

		switch (family) {
		@@ -801,7 +802,8 @@ int xfrm_state_add(struct xfrm_state *x)

		if (use_spi && x->km.seq) {
		x1 = __xfrm_find_acq_byseq(x->km.seq);
		if (x1 && xfrm_addr_cmp(&x1->id.daddr, &x->id.daddr, family)) {
		if (x1 && ((x1->id.proto != x->id.proto) \|\|
		xfrm_addr_cmp(&x1->id.daddr, &x->id.daddr, family))) {
		xfrm_state_put(x1);
		x1 = NULL;
		}

Admin message