summaryrefslogtreecommitdiffstats
path: root/crypto/af_alg.c
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 /crypto/af_alg.c
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 'crypto/af_alg.c')
-rw-r--r--crypto/af_alg.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 415a54ced4d6..444a387df219 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -1138,12 +1138,6 @@ int af_alg_get_rsgl(struct sock *sk, struct msghdr *msg, int flags,
if (!af_alg_readable(sk))
break;
- if (!ctx->used) {
- err = af_alg_wait_for_data(sk, flags);
- if (err)
- return err;
- }
-
seglen = min_t(size_t, (maxsize - len),
msg_data_left(msg));