VisionFive2 Linux kernel

author: Robert Holmes <robeholmes@gmail.com> 2019-04-23 07:39:29 +0000 committer: Liu Yang <Yang.Liu.sn@gmail.com> 2021-02-17 01:14:17 +0800 commit: 8140934dbc43dfb5f42187466eb5cbfd0da62d6e parent: 52b359368f41ad87ff401c2422ee2895bcd12fc9

Commit Summary:

KEYS: Make use of platform keyring for module signature verify

Diffstat:

1 file changed, 8 insertions, 1 deletion

diff --git a/kernel/module_signing.c b/kernel/module_signing.c
index 9d9fc678c91d..84ad75a53c83 100644
--- a/kernel/module_signing.c
+++ b/kernel/module_signing.c
@@ -38,8 +38,15 @@ int mod_verify_sig(const void *mod, struct load_info *info)
 	modlen -= sig_len + sizeof(ms);
 	info->len = modlen;
 
-	return verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len,
+	ret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len,
 				      VERIFY_USE_SECONDARY_KEYRING,
 				      VERIFYING_MODULE_SIGNATURE,
 				      NULL, NULL);
+	if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) {
+		ret = verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len,
+				VERIFY_USE_PLATFORM_KEYRING,
+				VERIFYING_MODULE_SIGNATURE,
+				NULL, NULL);
+	}
+	return ret;
 }