Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: crct10dif-generic - fix use via crypto_shash_digest()

Browse Source 
The ->digest() method of crct10dif-generic reads the current CRC value
from the shash_desc context.  But this value is uninitialized, causing
crypto_shash_digest() to compute the wrong result.  Fix it.

Probably this wasn't noticed before because lib/crc-t10dif.c only uses
crypto_shash_update(), not crypto_shash_digest().  Likewise,
crypto_shash_digest() is not yet tested by the crypto self-tests because
those only test the ahash API which only uses shash init/update/final.

This bug was detected by my patches that improve testmgr to fuzz
algorithms against their generic implementation.

Fixes: 2d31e518a4 ("crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework")
Cc: <stable@vger.kernel.org> # v3.11+
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2019-03-31 13:04:12 -07:00 committed by Herbert Xu
parent f947d7fd12
commit 307508d107
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/crct10dif_generic.c
View File

@ -65,10 +65,9 @@ static int chksum_final(struct shash_desc *desc, u8 *out)
return 0; return 0;
} }
static int __chksum_finup(__u16 *crcp, const u8 *data, unsigned int len, static int __chksum_finup(__u16 crc, const u8 *data, unsigned int len, u8 *out)
u8 *out)
{ {
*(__u16 *)out = crc_t10dif_generic(*crcp, data, len); *(__u16 *)out = crc_t10dif_generic(crc, data, len);
return 0; return 0;
} }
@ -77,15 +76,13 @@ static int chksum_finup(struct shash_desc *desc, const u8 *data,
{ {
struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
return __chksum_finup(&ctx->crc, data, len, out); return __chksum_finup(ctx->crc, data, len, out);
} }
static int chksum_digest(struct shash_desc *desc, const u8 *data, static int chksum_digest(struct shash_desc *desc, const u8 *data,
unsigned int length, u8 *out) unsigned int length, u8 *out)
{ {
struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); return __chksum_finup(0, data, length, out);
return __chksum_finup(&ctx->crc, data, length, out);
} }
static struct shash_alg alg = { static struct shash_alg alg = {