From: Ke Wu <mikewu@google.com>
Date: Tue, 6 Nov 2018 23:21:30 +0000 (-0800)
Subject: modsign: use all trusted keys to verify module signature
X-Git-Tag: archive/raspbian/5.2.17-1+rpi1^2^2^2^2~113
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=916bf8c56714a8bc3fd6faaa21a1c3f13cfe3d05;p=linux.git

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>

Gbp-Pq: Topic features/all/db-mok-keyring
Gbp-Pq: Name 0007-modsign-Use-secondary-trust-keyring-for-module-signi.patch
---

diff --git a/kernel/module_signing.c b/kernel/module_signing.c
index f2075ce8e4b..6b9a926fd86 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);
 }