diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2021-10-19 21:28:02 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2021-10-29 21:04:02 +0800 |
| commit | cad439fc040efe5f4381e3a7d583c5c200dbc186 (patch) | |
| tree | caf41548f2537f6e37f080fddb39c040620e2cf5 /crypto/api.c | |
| parent | crypto: tcrypt - fix skcipher multi-buffer tests for 1420B blocks (diff) | |
| download | linux-dev-cad439fc040efe5f4381e3a7d583c5c200dbc186.tar.xz linux-dev-cad439fc040efe5f4381e3a7d583c5c200dbc186.zip | |
crypto: api - Do not create test larvals if manager is disabled
The delayed boot-time testing patch created a dependency loop
between api.c and algapi.c because it added a crypto_alg_tested
call to the former when the crypto manager is disabled.
We could instead avoid creating the test larvals if the crypto
manager is disabled. This avoids the dependency loop as well
as saving some unnecessary work, albeit in a very unlikely case.
Reported-by: Nathan Chancellor <nathan@kernel.org>
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Reported-by: kernel test robot <lkp@intel.com>
Fixes: adad556efcdd ("crypto: api - Fix built-in testing dependency failures")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
| -rw-r--r-- | crypto/api.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crypto/api.c b/crypto/api.c index ee5991fe11f8..cf0869dd130b 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -167,11 +167,8 @@ void crypto_wait_for_test(struct crypto_larval *larval) int err; err = crypto_probing_notify(CRYPTO_MSG_ALG_REGISTER, larval->adult); - if (err != NOTIFY_STOP) { - if (WARN_ON(err != NOTIFY_DONE)) - goto out; - crypto_alg_tested(larval->alg.cra_driver_name, 0); - } + if (WARN_ON_ONCE(err != NOTIFY_STOP)) + goto out; err = wait_for_completion_killable(&larval->completion); WARN_ON(err); |