summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-01-08 23:05:11 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-01-08 23:05:11 +0300
commitea1c87c156d94dd78b4f5267ec40c403b2da7e14 (patch)
tree84a8227bbcc316a022f3d58d09ac1a165b0c76e2 /arch/arm
parentef0ba05538299f1391cbe097de36895bb36ecfe6 (diff)
parent0aa171e9b267ce7c52d3a3df7bc9c1fc0203dec5 (diff)
downloadlinux-ea1c87c156d94dd78b4f5267ec40c403b2da7e14.tar.xz
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This fixes a functional bug in arm/chacha-neon as well as a potential buffer overflow in ecdh" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: ecdh - avoid buffer overflow in ecdh_set_secret() crypto: arm/chacha-neon - add missing counter increment
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/crypto/chacha-glue.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c
index 7b5cf8430c6d..cdde8fd01f8f 100644
--- a/arch/arm/crypto/chacha-glue.c
+++ b/arch/arm/crypto/chacha-glue.c
@@ -60,6 +60,7 @@ static void chacha_doneon(u32 *state, u8 *dst, const u8 *src,
chacha_block_xor_neon(state, d, s, nrounds);
if (d != dst)
memcpy(dst, buf, bytes);
+ state[12]++;
}
}