diff options
| author | Ard Biesheuvel | 2019-01-24 17:33:46 +0100 |
|---|---|---|
| committer | Herbert Xu | 2019-02-01 07:42:05 +0100 |
| commit | 969e2f59d589c15f6aaf306e590dde16f12ea4b3 (patch) | |
| tree | 666cf4412f3f19c9609c817f4ffadab659a9c8d7 /arch/arm64/crypto | |
| parent | crypto: arm64/aes-ccm - fix logical bug in AAD MAC handling (diff) | |
| download | kernel-qcow2-linux-969e2f59d589c15f6aaf306e590dde16f12ea4b3.tar.gz kernel-qcow2-linux-969e2f59d589c15f6aaf306e590dde16f12ea4b3.tar.xz kernel-qcow2-linux-969e2f59d589c15f6aaf306e590dde16f12ea4b3.zip | |
crypto: arm64/aes-ccm - fix bugs in non-NEON fallback routine
Commit 5092fcf34908 ("crypto: arm64/aes-ce-ccm: add non-SIMD generic
fallback") introduced C fallback code to replace the NEON routines
when invoked from a context where the NEON is not available (i.e.,
from the context of a softirq taken while the NEON is already being
used in kernel process context)
Fix two logical flaws in the MAC calculation of the associated data.
Reported-by: Eric Biggers <ebiggers@kernel.org>
Fixes: 5092fcf34908 ("crypto: arm64/aes-ce-ccm: add non-SIMD generic fallback")
Cc: stable@vger.kernel.org
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/arm64/crypto')
| -rw-r--r-- | arch/arm64/crypto/aes-ce-ccm-glue.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/crypto/aes-ce-ccm-glue.c b/arch/arm64/crypto/aes-ce-ccm-glue.c index 68b11aa690e4..986191e8c058 100644 --- a/arch/arm64/crypto/aes-ce-ccm-glue.c +++ b/arch/arm64/crypto/aes-ce-ccm-glue.c @@ -125,7 +125,7 @@ static void ccm_update_mac(struct crypto_aes_ctx *key, u8 mac[], u8 const in[], abytes -= added; } - while (abytes > AES_BLOCK_SIZE) { + while (abytes >= AES_BLOCK_SIZE) { __aes_arm64_encrypt(key->key_enc, mac, mac, num_rounds(key)); crypto_xor(mac, in, AES_BLOCK_SIZE); @@ -139,8 +139,6 @@ static void ccm_update_mac(struct crypto_aes_ctx *key, u8 mac[], u8 const in[], num_rounds(key)); crypto_xor(mac, in, abytes); *macp = abytes; - } else { - *macp = 0; } } } |