summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKe Wu <mikewu@google.com>2018-11-06 15:21:30 -0800
committerJessica Yu <jeyu@kernel.org>2018-11-07 14:41:41 +0100
commite84cd7ee630e44a2cc8ae49e85920a271b214cb3 (patch)
tree24392f7daf560a7346e6d85adea9de931c55ec20
parent651022382c7f8da46cb4872a545ee1da6d097d2a (diff)
modsign: use all trusted keys to verify module signature
Make mod_verify_sig to use all trusted keys. This allows keys in secondary_trusted_keys to be used to verify PKCS#7 signature on a kernel module. Signed-off-by: Ke Wu <mikewu@google.com> Signed-off-by: Jessica Yu <jeyu@kernel.org>
-rw-r--r--kernel/module_signing.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/module_signing.c b/kernel/module_signing.c
index f2075ce8e4b3..6b9a926fd86b 100644
--- a/kernel/module_signing.c
+++ b/kernel/module_signing.c
@@ -83,6 +83,7 @@ int mod_verify_sig(const void *mod, struct load_info *info)
}
return verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len,
- NULL, VERIFYING_MODULE_SIGNATURE,
+ VERIFY_USE_SECONDARY_KEYRING,
+ VERIFYING_MODULE_SIGNATURE,
NULL, NULL);
}