]> git.baikalelectronics.ru Git - kernel.git/commitdiff
crypto: drbg - Only fail when jent is unavailable in FIPS mode
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 28 Mar 2023 03:35:23 +0000 (11:35 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:35:42 +0000 (11:35 +0200)
[ Upstream commit 686cd976b6ddedeeb1a1fb09ba53a891d3cc9a03 ]

When jent initialisation fails for any reason other than ENOENT,
the entire drbg fails to initialise, even when we're not in FIPS
mode.  This is wrong because we can still use the kernel RNG when
we're not in FIPS mode.

Change it so that it only fails when we are in FIPS mode.

Fixes: f5d76d425e91 ("crypto: drbg - Use callback API for random readiness")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
crypto/drbg.c

index 732b72e4ee4dd19e88dc4bf4af3c0d3bb50c709d..df80752fb649bd79f971d7b229fb8adf59d6d900 100644 (file)
@@ -1519,7 +1519,7 @@ static int drbg_prepare_hrng(struct drbg_state *drbg)
                const int err = PTR_ERR(drbg->jent);
 
                drbg->jent = NULL;
-               if (fips_enabled || err != -ENOENT)
+               if (fips_enabled)
                        return err;
                pr_info("DRBG: Continuing without Jitter RNG\n");
        }