Skip to contentSkip to conversation

: Fix hmac_digest from the SG breakage.

PATCH In review Vlad Yasevich 4 participants 6 messages Oct 25, 2007 – Oct 26, 2007 Crypto API

lore
Share & tools
lore

Vlad Yasevich

author
#0 lore raw

PATCH 1/1 : Fix hmac_digest from the SG breakage.

Crypto now uses SG helper functions. Fix hmac_digest to use those functions correctly and fix the oops associated with it.

Signed-off-by Vlad Yasevich <[email protected]>
---
 crypto/hmac.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
crypto/hmac.c +4 -2
index e4eb6ac..8b7a832 100644
@@ -158,10 +158,12 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
 	desc.tfm = ctx->child;
 	desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
 
+	sg_init_table(sg1, 2);
 	sg_set_buf(sg1, ipad, bs);
-
-	sg_set_page(&sg[1], (void *) sg);
+	sg_set_page(&sg1[1], (void *) sg);
 	sg1[1].length = 0;
+
+	sg_init_table(sg2, 1);
 	sg_set_buf(sg2, opad, bs + ds);
 
 	err = crypto_hash_digest(&desc, sg1, nbytes + bs, digest);
Signature · 1 line
1.5.2.4
maintainer
#1 lore raw

From: Vlad Yasevich <[email protected]>
Date: Thu, 25 Oct 2007 16:07:17 -0400

Quoted 4 lines

Crypto now uses SG helper functions. Fix hmac_digest to use those functions correctly and fix the oops associated with it.

Signed-off-by Vlad Yasevich <[email protected]>

Since I keep hitting this when I try to test IPSEC on my systems I'm going to apply this to my net-2.6 tree.

Herbert, I hope you don't mind :-)

maintainer
#2 lore raw
Quoted 5 lines · David Miller

Since I keep hitting this when I try to test IPSEC on my systems I'm going to apply this to my net-2.6 tree.

Herbert, I hope you don't mind :-)

It looks good to me. Thanks Dave!

Signature · 4 lines
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
author
#3 lore raw
In reply to David Miller
Quoted 6 lines · David Miller

From: Vlad Yasevich <[email protected]>
Date: Thu, 25 Oct 2007 16:07:17 -0400

Quoted 3 lines

Crypto now uses SG helper functions. Fix hmac_digest to use those functions correctly and fix the oops associated with it.

Quoted 7 lines
Quoted 1 line
Signed-off-by Vlad Yasevich <[email protected]>

Since I keep hitting this when I try to test IPSEC on my systems I'm going to apply this to my net-2.6 tree.

Herbert, I hope you don't mind :-)

Got reported to me because SCTP kept breaking. Wasn't sure which way to send it.

As long as it's somewhere, I am happy.

Thanks
-vlad

maintainer
#4 lore raw
Quoted 5 lines · Vlad Yasevich

Got reported to me because SCTP kept breaking. Wasn't sure which way to send it.

As long as it's somewhere, I am happy.

I'm happy too :)

Dave has kindly fixed the IPsec stack to initalise the tables properly. I'm currently in the process of fixing the rest of the crypto users to initalise the tables properly.

Jens, could you please do a similar run for the rest of the kernel?

Thanks,

Signature · 4 lines
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
#5 lore raw
Quoted 7 lines · Herbert Xu
Quoted 5 lines · Vlad Yasevich

Got reported to me because SCTP kept breaking. Wasn't sure which way to send it.

As long as it's somewhere, I am happy.

Quoted 8 lines

I'm happy too :)

Dave has kindly fixed the IPsec stack to initalise the tables properly. I'm currently in the process of fixing the rest of the crypto users to initalise the tables properly.

Jens, could you please do a similar run for the rest of the kernel?

Yeah, I've already done large parts of it, will continue to make sure everything gets seen.

Signature · 1 line
Jens Axboe