diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-04-09 23:46:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-22 07:37:37 +0200 |
| commit | d42d342022b18d13a0cf3a4425011e17f3ecd9cb (patch) | |
| tree | 1fc2d539e0e4bee2099d140bfb1cd1e70ff57f01 /arch | |
| parent | 69b9d32d5139e1a722d3a12bf57f752c835b17b5 (diff) | |
| download | linux-rpi3-d42d342022b18d13a0cf3a4425011e17f3ecd9cb.tar.gz linux-rpi3-d42d342022b18d13a0cf3a4425011e17f3ecd9cb.tar.bz2 linux-rpi3-d42d342022b18d13a0cf3a4425011e17f3ecd9cb.zip | |
crypto: arm64/aes-neonbs - don't access already-freed walk.iv
commit 4a8108b70508df0b6c4ffa4a3974dab93dcbe851 upstream.
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.
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 unconditionally accessing walk.iv has caused a
real problem in other algorithms. Thus, update xts-aes-neonbs to start
checking the return value of skcipher_walk_virt().
Fixes: 1abee99eafab ("crypto: arm64/aes - reimplement bit-sliced ARM/NEON implementation for arm64")
Cc: <stable@vger.kernel.org> # v4.11+
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/crypto/aes-neonbs-glue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/crypto/aes-neonbs-glue.c b/arch/arm64/crypto/aes-neonbs-glue.c index e7a95a566462..5cc248967387 100644 --- a/arch/arm64/crypto/aes-neonbs-glue.c +++ b/arch/arm64/crypto/aes-neonbs-glue.c @@ -304,6 +304,8 @@ static int __xts_crypt(struct skcipher_request *req, int err; err = skcipher_walk_virt(&walk, req, false); + if (err) + return err; kernel_neon_begin(); neon_aes_ecb_encrypt(walk.iv, walk.iv, ctx->twkey, ctx->key.rounds, 1); |