shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix context in "KEYS: Make use of platform keyring for module signature verify"

Browse Source 
This patch had no space at the beginning of the context lines.
quilt/patch accepts "\t" at the beginning as equivalent to " \t", but
dpkg-source does not.
This commit is contained in:
Ben Hutchings
2019-11-09 15:40:36 +00:00
parent c323c453b2
commit bc181d00ed
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
debian/patches/features/all/db-mok-keyring/KEYS-Make-use-of-platform-keyring-for-module-signature.patch vendored
View File

@@ -19,14 +19,12 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
kernel/module_signing.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
Index: debian-kernel/kernel/module_signing.c
===================================================================
--- debian-kernel.orig/kernel/module_signing.c
+++ debian-kernel/kernel/module_signing.c
--- a/kernel/module_signing.c
+++ b/kernel/module_signing.c
@@ -135,6 +135,13 @@ int mod_verify_sig(const void *mod, stru
VERIFYING_MODULE_SIGNATURE,
NULL, NULL);
pr_devel("verify_pkcs7_signature() = %d\n", ret);
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,
@@ -34,6 +32,6 @@ Index: debian-kernel/kernel/module_signing.c
+ NULL, NULL);
+ pr_devel("verify_pkcs7_signature() = %d\n", ret);
+ }
/* checking hash of module is in blacklist */
if (!ret)
/* checking hash of module is in blacklist */
if (!ret)