diff options
author | Matthew Garrett <mjg59@google.com> | 2018-06-08 14:57:42 -0700 |
---|---|---|
committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2018-07-18 07:27:22 -0400 |
commit | 7f5f6c28ba47c8dd639c6e64e81d196eca5e56d6 (patch) | |
tree | 67a67326428eddd28882821f34ef1d9a9fa0f674 | |
parent | c5c0586a6771a33a5da7985495c1beab72d292b1 (diff) | |
download | linux-crypto-7f5f6c28ba47c8dd639c6e64e81d196eca5e56d6.tar.gz linux-crypto-7f5f6c28ba47c8dd639c6e64e81d196eca5e56d6.zip |
evm: Don't deadlock if a crypto algorithm is unavailable
When EVM attempts to appraise a file signed with a crypto algorithm the
kernel doesn't have support for, it will cause the kernel to trigger a
module load. If the EVM policy includes appraisal of kernel modules this
will in turn call back into EVM - since EVM is holding a lock until the
crypto initialisation is complete, this triggers a deadlock. Add a
CRYPTO_NOLOAD flag and skip module loading if it's set, and add that flag
in the EVM case in order to fail gracefully with an error message
instead of deadlocking.
Signed-off-by: Matthew Garrett <mjg59@google.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to '')
-rw-r--r-- | crypto/api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/api.c b/crypto/api.c index 0ee632bb..7aca9f86 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -229,7 +229,7 @@ static struct crypto_alg *crypto_larval_lookup(const char *name, u32 type, mask &= ~(CRYPTO_ALG_LARVAL | CRYPTO_ALG_DEAD); alg = crypto_alg_lookup(name, type, mask); - if (!alg) { + if (!alg && !(mask & CRYPTO_NOLOAD)) { request_module("crypto-%s", name); if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask & |