Commit c20a66f4 authored Dec 09, 2009 by Martin Willi Committed by David S. Miller Dec 11, 2009

xfrm: Fix truncation length of authentication algorithms installed via PF_KEY



Commit 4447bb33 ("xfrm: Store aalg in
xfrm_state with a user specified truncation length") breaks
installation of authentication algorithms via PF_KEY, as the state
specific truncation length is not installed with the algorithms
default truncation length.  This patch initializes state properly to
the default if installed via PF_KEY.

Signed-off-by: Martin Willi <martin@strongswan.org>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent de039f02

net/key/af_key.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1193,6 +1193,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
	x->aalg->alg_key_len = key->sadb_key_bits;		x->aalg->alg_key_len = key->sadb_key_bits;
	memcpy(x->aalg->alg_key, key+1, keysize);		memcpy(x->aalg->alg_key, key+1, keysize);
	}		}
			x->aalg->alg_trunc_len = a->uinfo.auth.icv_truncbits;
	x->props.aalgo = sa->sadb_sa_auth;		x->props.aalgo = sa->sadb_sa_auth;
	/* x->algo.flags = sa->sadb_sa_flags; */		/* x->algo.flags = sa->sadb_sa_flags; */
	}		}