From: Stephan Mueller <smueller@chronox.de>
To: Eric Biggers <ebiggers@kernel.org>
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
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>
Subject: Re: [PATCH v2] crypto: DRBG - always try to free Jitter RNG instance
Date: Fri, 05 Jun 2020 07:58:15 +0200 [thread overview]
Message-ID: <5789529.snvNDI1NMy@tauon.chronox.de> (raw)
In-Reply-To: <20200605004336.GC148196@sol.localdomain>
Am Freitag, 5. Juni 2020, 02:43:36 CEST schrieb Eric Biggers:
Hi Eric,
> On Thu, Jun 04, 2020 at 08:41:00AM +0200, Stephan Müller wrote:
> > 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 | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/crypto/drbg.c b/crypto/drbg.c
> > index 37526eb8c5d5..8a0f16950144 100644
> > --- a/crypto/drbg.c
> > +++ b/crypto/drbg.c
> > @@ -1631,6 +1631,9 @@ 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);
> >
> > + }
> > +
> > + if (!IS_ERR_OR_NULL(drbg->jent)) {
> >
> > crypto_free_rng(drbg->jent);
> > drbg->jent = NULL;
> >
> > }
>
> It it okay that ->jent can be left as an ERR_PTR() value?
>
> Perhaps it should always be set to NULL?
The error value is used in the drbg_instantiate function. There it is checked
whether -ENOENT (i.e. the cipher is not available) or any other error is
present. I am not sure we should move that check.
Thanks for the review.
>
> - Eric
Ciao
Stephan
next prev parent reply other threads:[~2020-06-05 6:04 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 [this message]
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 ` [PATCH v3] " Stephan Müller
2020-06-12 6:49 ` 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=5789529.snvNDI1NMy@tauon.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;
as well as URLs for NNTP newsgroup(s).