summaryrefslogtreecommitdiffstats
path: root/crypto/algif_aead.c
diff options
context:
space:
mode:
authorOndrej Mosnacek <omosnace@redhat.com>2020-08-12 14:58:25 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2020-08-13 09:09:32 +0200
commit21dfbcd1f5cbff9cf2f9e7e43475aed8d072b0dd (patch)
tree64f287d2b506bc1f88147319dae4c32945b275f0 /crypto/algif_aead.c
parentcrypto: sa2ul - Fix inconsistent IS_ERR and PTR_ERR (diff)
downloadlinux-21dfbcd1f5cbff9cf2f9e7e43475aed8d072b0dd.tar.xz
linux-21dfbcd1f5cbff9cf2f9e7e43475aed8d072b0dd.zip
crypto: algif_aead - fix uninitialized ctx->init
In skcipher_accept_parent_nokey() the whole af_alg_ctx structure is cleared by memset() after allocation, so add such memset() also to aead_accept_parent_nokey() so that the new "init" field is also initialized to zero. Without that the initial ctx->init checks might randomly return true and cause errors. While there, also remove the redundant zero assignments in both functions. Found via libkcapi testsuite. Cc: Stephan Mueller <smueller@chronox.de> Fixes: f3c802a1f300 ("crypto: algif_aead - Only wake up when ctx->more is zero") Suggested-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
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 d48d2156e621..43c6aa784858 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -558,12 +558,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;