[PATCH 3.16 015/328] crypto: vmac - require a block cipher with 128-bit block size

From: Ben Hutchings
Date: Sun Dec 09 2018 - 17:28:03 EST

3.16.62-rc1 review patch. If anyone has any objections, please let me know.


From: Eric Biggers <ebiggers@xxxxxxxxxx>

commit 73bf20ef3df262026c3470241ae4ac8196943ffa upstream.

The VMAC template assumes the block cipher has a 128-bit block size, but
it failed to check for that. Thus it was possible to instantiate it
using a 64-bit block size cipher, e.g. "vmac(cast5)", causing
uninitialized memory to be used.

Add the needed check when instantiating the template.

Fixes: f1939f7c5645 ("crypto: vmac - New hash algorithm for intel_txt support")
Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
crypto/vmac.c | 4 ++++
1 file changed, 4 insertions(+)

--- a/crypto/vmac.c
+++ b/crypto/vmac.c
@@ -655,6 +655,10 @@ static int vmac_create(struct crypto_tem
if (IS_ERR(alg))
return PTR_ERR(alg);

+ err = -EINVAL;
+ if (alg->cra_blocksize != 16)
+ goto out_put_alg;
inst = shash_alloc_instance("vmac", alg);
err = PTR_ERR(inst);
if (IS_ERR(inst))