summaryrefslogtreecommitdiffstats
path: root/include/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-12-22 12:22:48 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-12-22 12:22:48 -0800
commit0fc0f18bed026a7aa6d5499d06cc9a6eb47dc3cc (patch)
tree65b591e05b563441c22d28ef76485de8ad1deefc /include/crypto
parent6ed16756cc814040560a6e107e8f3d2dcab82396 (diff)
parentd53c5135792319e095bb126bc43b2ee98586f7fe (diff)
downloadlinux-0fc0f18bed026a7aa6d5499d06cc9a6eb47dc3cc.tar.bz2
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 the following issues: - fix chacha20 crash on zero-length input due to unset IV - fix potential race conditions in mcryptd with spinlock - only wait once at top of algif recvmsg to avoid inconsistencies - fix potential use-after-free in algif_aead/algif_skcipher" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: af_alg - fix race accessing cipher request crypto: mcryptd - protect the per-CPU queue with a lock crypto: af_alg - wait for data at beginning of recvmsg crypto: skcipher - set walk.iv for zero-length inputs
Diffstat (limited to 'include/crypto')
-rw-r--r--include/crypto/mcryptd.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/crypto/mcryptd.h b/include/crypto/mcryptd.h
index cceafa01f907..b67404fc4b34 100644
--- a/include/crypto/mcryptd.h
+++ b/include/crypto/mcryptd.h
@@ -27,6 +27,7 @@ static inline struct mcryptd_ahash *__mcryptd_ahash_cast(
struct mcryptd_cpu_queue {
struct crypto_queue queue;
+ spinlock_t q_lock;
struct work_struct work;
};