Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9eb0c47 authored by Stephan Müller's avatar Stephan Müller Committed by Greg Kroah-Hartman
Browse files

crypto: drbg - always try to free Jitter RNG instance 



commit 819966c06b759022e9932f328284314d9272b9f3 upstream.

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

Reported-by: default avatar <syzbot+2e635807decef724a1fa@syzkaller.appspotmail.com>
Fixes: 97f2650e5040 ("crypto: drbg - always seeded with SP800-90B ...")
Signed-off-by: default avatarStephan Mueller <smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f284afc3

crypto/drbg.c

+4 −2
Original line number Diff line number Diff line
@@ -1647,9 +1647,11 @@ static int drbg_uninstantiate(struct drbg_state *drbg) 
	if (drbg->random_ready.notifier_call) {

		unregister_random_ready_notifier(&drbg->random_ready);

		cancel_work_sync(&drbg->seed_work);

	}



	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);