summaryrefslogtreecommitdiff
path: root/crypto/algif_aead.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-08-14 13:09:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-14 13:09:15 -0700
commit955bf6b8df0ddcabb4ef3adc200e760390ede0b7 (patch)
tree5e86d7415eb5e96afb28a050c765edaefd41d4c6 /crypto/algif_aead.c
parent3cb57efe078f8f645baa6bcca5faaed236de960f (diff)
parent39709b59769d024936bdb204d0b49a6ae9d83b3e (diff)
downloadlinux-crypto-955bf6b8df0ddcabb4ef3adc200e760390ede0b7.tar.gz
linux-crypto-955bf6b8df0ddcabb4ef3adc200e760390ede0b7.zip
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "This fixes a regression in af_alg" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: algif_aead - fix uninitialized ctx->init
Diffstat (limited to 'crypto/algif_aead.c')
-rw-r--r--crypto/algif_aead.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index c1767844..21efa786 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -554,12 +554,6 @@ static int aead_accept_parent_nokey(void *private, struct sock *sk)
INIT_LIST_HEAD(&ctx->tsgl_list);
ctx->len = len;
- ctx->used = 0;
- atomic_set(&ctx->rcvused, 0);
- ctx->more = 0;
- ctx->merge = 0;
- ctx->enc = 0;
- ctx->aead_assoclen = 0;
crypto_init_wait(&ctx->wait);
ask->private = ctx;