Re: linux-next: Tree for March 20 - crypto crash on s390

[Herbert Xu]

On Fri, Mar 20, 2009 at 01:59:12PM +0100, Heiko Carstens wrote:
>
> gets called with an shash_desc where
> 
> bsize = crypto_shash_blocksize(desc->tfm);
> 
> results in bsize with zero.

Oops, this patch should fix it.

commit b24c94a0d65282dc466339390472d7539e1706c2
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date:   Sat Mar 21 14:25:19 2009 +0800

    crypto: sha512-s390 - Add missing block size
    
    I missed the block size when converting sha512-s390 to shash.
    
    Reported-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>

diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c
index 420acf4..37b4236 100644
--- a/arch/s390/crypto/sha512_s390.c
+++ b/arch/s390/crypto/sha512_s390.c
@@ -84,6 +84,7 @@ static struct shash_alg sha384_alg = {
 		.cra_driver_name=	"sha384-s390",
 		.cra_priority	=	CRYPT_S390_PRIORITY,
 		.cra_flags	=	CRYPTO_ALG_TYPE_SHASH,
+		.cra_blocksize	=	SHA512_BLOCK_SIZE,
 		.cra_ctxsize	=	sizeof(struct s390_sha_ctx),
 		.cra_module	=	THIS_MODULE,
 	}

Thanks,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/