Commit 6a69ccd2 authored by Matthew Garrett's avatar Matthew Garrett Committed by Greg Kroah-Hartman

evm: Don't deadlock if a crypto algorithm is unavailable

[ Upstream commit e2861fa7 ]

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: default avatarMatthew Garrett <>
Acked-by: default avatarHerbert Xu <>
Signed-off-by: default avatarMimi Zohar <>
Signed-off-by: default avatarSasha Levin <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent f4a6c714
......@@ -229,7 +229,7 @@ static struct crypto_alg *crypto_larval_lookup(const char *name, u32 type,
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 &
......@@ -112,6 +112,11 @@
#define CRYPTO_ALG_OPTIONAL_KEY 0x00004000
* Don't trigger module loading
#define CRYPTO_NOLOAD 0x00008000
* Transform masks and values (for crt_flags).
......@@ -97,7 +97,8 @@ static struct shash_desc *init_desc(char type)
if (*tfm)
goto out;
*tfm = crypto_alloc_shash(algo, 0, CRYPTO_ALG_ASYNC);
*tfm = crypto_alloc_shash(algo, 0,
if (IS_ERR(*tfm)) {
rc = PTR_ERR(*tfm);
pr_err("Can not allocate %s (reason: %ld)\n", algo, rc);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment