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

Commit b21c7e28 authored by Nicolai Stange's avatar Nicolai Stange Committed by Greg Kroah-Hartman
Browse files

crypto: drbg - make drbg_prepare_hrng() handle jent instantiation errors 



[ Upstream commit 559edd47cce4cc407d606b4d7f376822816fd4b8 ]

Now that drbg_prepare_hrng() doesn't do anything but to instantiate a
jitterentropy crypto_rng instance, it looks a little odd to have the
related error handling at its only caller, drbg_instantiate().

Move the handling of jitterentropy allocation failures from
drbg_instantiate() close to the allocation itself in drbg_prepare_hrng().

There is no change in behaviour.

Signed-off-by: default avatarNicolai Stange <nstange@suse.de>
Reviewed-by: default avatarStephan Müller <smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Stable-dep-of: 686cd976b6dd ("crypto: drbg - Only fail when jent is unavailable in FIPS mode")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 14efbe24

crypto/drbg.c

+8 −8
Original line number Diff line number Diff line
@@ -1515,6 +1515,14 @@ static int drbg_prepare_hrng(struct drbg_state *drbg) 
		return 0;



	drbg->jent = crypto_alloc_rng("jitterentropy_rng", 0, 0);

	if (IS_ERR(drbg->jent)) {

		const int err = PTR_ERR(drbg->jent);



		drbg->jent = NULL;

		if (fips_enabled || err != -ENOENT)

			return err;

		pr_info("DRBG: Continuing without Jitter RNG\n");

	}



	return 0;

}
@@ -1570,14 +1578,6 @@ static int drbg_instantiate(struct drbg_state *drbg, struct drbg_string *pers, 
		if (ret)

			goto free_everything;



		if (IS_ERR(drbg->jent)) {

			ret = PTR_ERR(drbg->jent);

			drbg->jent = NULL;

			if (fips_enabled || ret != -ENOENT)

				goto free_everything;

			pr_info("DRBG: Continuing without Jitter RNG\n");

		}



		reseed = false;

	}