2009-12-09 16:11:22

by Martin Willi

Subject: [PATCH] xfrm: Fix truncation length of authentication algorithms installed via PF_KEY

Commit 4447bb33f09444920a8f1d89e1540137429351b6 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 <[email protected]>
---
net/key/af_key.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/key/af_key.c b/net/key/af_key.c
index 84209fb..76fa6fe 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1193,6 +1193,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
x->aalg->alg_key_len = key->sadb_key_bits;
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->algo.flags = sa->sadb_sa_flags; */
}
--
1.6.3.3

2009-12-11 06:28:53

by Herbert Xu

Subject: Re: [PATCH] xfrm: Fix truncation length of authentication algorithms installed via PF_KEY

On Wed, Dec 09, 2009 at 05:11:15PM +0100, Martin Willi wrote:
> Commit 4447bb33f09444920a8f1d89e1540137429351b6 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 <[email protected]>

Acked-by: Herbert Xu <[email protected]>

Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2009-12-11 23:15:34

by David Miller

Subject: Re: [PATCH] xfrm: Fix truncation length of authentication algorithms installed via PF_KEY

From: Martin Willi <[email protected]>
Date: Wed, 9 Dec 2009 17:11:15 +0100

> Commit 4447bb33f09444920a8f1d89e1540137429351b6 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 <[email protected]>

Applied.

Herbert, thanks for reviewing, I didn't miss your ACK. :-)