diff options
| author | Stephan Müller <smueller@chronox.de> | 2020-06-07 15:20:26 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2020-06-15 17:38:54 +1000 |
| commit | f4d7cabd9661612f3019866664addbc463854102 (patch) | |
| tree | e6bf1e630a317294bc7ff035b74a5e2ebb3f1a77 | |
| parent | 2dae7d67d06328e0273dd45a995c6396f89f4e4a (diff) | |
| download | linux-crypto-f4d7cabd9661612f3019866664addbc463854102.tar.gz linux-crypto-f4d7cabd9661612f3019866664addbc463854102.zip | |
crypto: drbg - always try to free Jitter RNG instance
The Jitter RNG is unconditionally allocated as a seed source follwoing
the patch ffb82d3279a8. Thus, the instance must always be deallocated.
Reported-by: syzbot+2e635807decef724a1fa@syzkaller.appspotmail.com
Fixes: ffb82d3279a8 ("crypto: drbg - always seeded with SP800-90B ...")
Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/drbg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/drbg.c b/crypto/drbg.c index 37526eb8..8d80d93c 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); |