Commit 821720b9 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: x86/aes-ni - add missing error checks in XTS code 



The updated XTS code fails to check the return code of skcipher_walk_virt,
which may lead to skcipher_walk_abort() or skcipher_walk_done() being called
while the walk argument is in an inconsistent state.

So check the return value after each such call, and bail on errors.

Fixes: 2481104f ("crypto: x86/aes-ni-xts - rewrite and drop indirections via glue helper")
Reported-by: default avatarDave Hansen <dave.hansen@intel.com>
Reported-by: default avatarsyzbot <syzbot+5d1bad8042a8f0e8117a@syzkaller.appspotmail.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f03a3cab

arch/x86/crypto/aesni-intel_glue.c

+5 −0
Original line number Diff line number Diff line
@@ -849,6 +849,8 @@ static int xts_crypt(struct skcipher_request *req, bool encrypt) 
		return -EINVAL;



	err = skcipher_walk_virt(&walk, req, false);

	if (err)

		return err;



	if (unlikely(tail > 0 && walk.nbytes < walk.total)) {

		int blocks = DIV_ROUND_UP(req->cryptlen, AES_BLOCK_SIZE) - 2;
@@ -862,7 +864,10 @@ static int xts_crypt(struct skcipher_request *req, bool encrypt) 
		skcipher_request_set_crypt(&subreq, req->src, req->dst,

					   blocks * AES_BLOCK_SIZE, req->iv);

		req = &subreq;



		err = skcipher_walk_virt(&walk, req, false);

		if (err)

			return err;

	} else {

		tail = 0;

	}