Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b39ac2f4 authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman
Browse files

crypto: vmac - require a block cipher with 128-bit block size 



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: f1939f7c ("crypto: vmac - New hash algorithm for intel_txt support")
Cc: <stable@vger.kernel.org> # v2.6.32+
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cd635c1c

crypto/vmac.c

+4 −0
Original line number Diff line number Diff line
@@ -655,6 +655,10 @@ static int vmac_create(struct crypto_template *tmpl, struct rtattr **tb) 
	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))