mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Stephan Müller" <smueller@chronox.de>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: davem@davemloft.net, herbert@gondor.apana.org.au,
	linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
	syzkaller-bugs@googlegroups.com,
	syzbot <syzbot+2e635807decef724a1fa@syzkaller.appspotmail.com>,
	Eric Biggers <ebiggers@kernel.org>,
	Dan Carpenter <dan.carpenter@oracle.com>
Subject: [PATCH v3] crypto: DRBG - always try to free Jitter RNG instance
Date: Sun, 07 Jun 2020 15:20:26 +0200	[thread overview]
Message-ID: <4563687.31r3eYUQgx@positron.chronox.de> (raw)
In-Reply-To: <2551009.mvXUDI8C0e@positron.chronox.de>

The Jitter RNG is unconditionally allocated as a seed source follwoing
the patch 97f2650e5040. Thus, the instance must always be deallocated.

Reported-by: syzbot+2e635807decef724a1fa@syzkaller.appspotmail.com
Fixes: 97f2650e5040 ("crypto: drbg - always seeded with SP800-90B ...")
Signed-off-by: Stephan Mueller <smueller@chronox.de>
---
 crypto/drbg.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crypto/drbg.c b/crypto/drbg.c
index 37526eb8c5d5..8d80d93cab97 100644
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@ -1631,10 +1631,12 @@ static int drbg_uninstantiate(struct drbg_state *drbg)
 	if (drbg->random_ready.func) {
 		del_random_ready_callback(&drbg->random_ready);
 		cancel_work_sync(&drbg->seed_work);
-		crypto_free_rng(drbg->jent);
-		drbg->jent = NULL;
 	}
 
+	if (!IS_ERR_OR_NULL(drbg->jent))
+		crypto_free_rng(drbg->jent);
+	drbg->jent = NULL;
+
 	if (drbg->d_ops)
 		drbg->d_ops->crypto_fini(drbg);
 	drbg_dealloc_state(drbg);
-- 
2.26.2





  parent reply	other threads:[~2020-06-07 13:20 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-03  3:41 memory leak in crypto_create_tfm syzbot
2020-06-03  3:55 ` Eric Biggers
2020-06-03  8:08 ` [PATCH] crypto: DRBG - always try to free Jitter RNG instance Stephan Müller
2020-06-03 11:09   ` Dan Carpenter
2020-06-03 11:40     ` Stephan Mueller
2020-06-04  6:41     ` [PATCH v2] " Stephan Müller
2020-06-05  0:43       ` Eric Biggers
2020-06-05  5:58         ` Stephan Mueller
2020-06-05  6:16           ` Eric Biggers
2020-06-05  6:52             ` Stephan Mueller
2020-06-05 16:21               ` Eric Biggers
2020-06-07 13:07                 ` Stephan Müller
2020-06-07 13:20       ` Stephan Müller [this message]
2020-06-12  6:49         ` [PATCH v3] " Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4563687.31r3eYUQgx@positron.chronox.de \
    --to=smueller@chronox.de \
    --cc=dan.carpenter@oracle.com \
    --cc=davem@davemloft.net \
    --cc=ebiggers@kernel.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=syzbot+2e635807decef724a1fa@syzkaller.appspotmail.com \
    --cc=syzkaller-bugs@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®