[PATCH] KEYS: Make use of platform keyring for module signature verify

Bug-Debian: https://bugs.debian.org/935945
Origin: https://src.fedoraproject.org/rpms/kernel/raw/master/f/KEYS-Make-use-of-platform-keyring-for-module-signature.patch

This patch completes commit 278311e417be ("kexec, KEYS: Make use of
platform keyring for signature verify") which, while adding the
platform keyring for bzImage verification, neglected to also add
this keyring for module verification.

As such, kernel modules signed with keys from the MokList variable
were not successfully verified.

Signed-off-by: Robert Holmes <robeholmes@gmail.com>
Signed-off-by: Jeremy Cline <jcline@redhat.com>
[bwh: Forward-ported to 5.19: adjust filename]

Gbp-Pq: Topic features/all/db-mok-keyring
Gbp-Pq: Name KEYS-Make-use-of-platform-keyring-for-module-signature.patch

diff --git a/kernel/module/signing.c b/kernel/module/signing.c
index 494aa421916aec04dfb0ca967aa80a087fd55d74..d178b9fe31ee80845132ad931927f9cba86097cc 100644 (file)
--- a/kernel/module/signing.c
+++ b/kernel/module/signing.c
@@ -116,6 +116,13 @@ int mod_verify_sig(const void *mod, struct load_info *info)
                                      VERIFYING_MODULE_SIGNATURE,
                                      NULL, NULL);
        pr_devel("verify_pkcs7_signature() = %d\n", ret);
+       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);
+                pr_devel("verify_pkcs7_signature() = %d\n", ret);
+       }
 
        /* checking hash of module is in blacklist */
        if (!ret)