Skip to content

Commit

Permalink
crypto: arm/aes-neonbs - don't access already-freed walk.iv
Browse files Browse the repository at this point in the history
If the user-provided IV needs to be aligned to the algorithm's
alignmask, then skcipher_walk_virt() copies the IV into a new aligned
buffer walk.iv.  But skcipher_walk_virt() can fail afterwards, and then
if the caller unconditionally accesses walk.iv, it's a use-after-free.

arm32 xts-aes-neonbs doesn't set an alignmask, so currently it isn't
affected by this despite unconditionally accessing walk.iv.  However
this is more subtle than desired, and it was actually broken prior to
the alignmask being removed by commit cc477bf ("crypto: arm/aes -
replace bit-sliced OpenSSL NEON code").  Thus, update xts-aes-neonbs to
start checking the return value of skcipher_walk_virt().

Fixes: e4e7f10 ("ARM: add support for bit sliced AES using NEON instructions")
Cc: <stable@vger.kernel.org> # v3.13+
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
ebiggers authored and herbertx committed Apr 18, 2019
1 parent edaf28e commit 767f015
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/arm/crypto/aes-neonbs-glue.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ static int __xts_crypt(struct skcipher_request *req,
int err;

err = skcipher_walk_virt(&walk, req, true);
if (err)
return err;

crypto_cipher_encrypt_one(ctx->tweak_tfm, walk.iv, walk.iv);

Expand Down

0 comments on commit 767f015

Please sign in to comment.