diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
commit | f7ba01a9677fffa21535bc6cdcad930a858d6106 (patch) | |
tree | 6eb6df39221f8926b813d63b41ffed9da18e6a5d /0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch | |
parent | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (diff) | |
parent | 6c2cc50051831fa502a8b082a312ca90e7039f3f (diff) | |
download | kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.gz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.xz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.zip |
merge masterkernel-5.7.0-0.rc3.1.vanilla.1.fc33kernel-5.7.0-0.rc3.1.vanilla.1.fc32kernel-5.7.0-0.rc3.1.vanilla.1.fc31kernel-5.7.0-0.rc3.1.vanilla.1.fc30
Diffstat (limited to '0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch')
-rw-r--r-- | 0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch b/0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch index 928a411db..7ad7928ce 100644 --- a/0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch +++ b/0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch @@ -1,4 +1,4 @@ -From 0e4630025e6155b15d2a1226e86b701eeb57e7f1 Mon Sep 17 00:00:00 2001 +From e005ce3d8f69125a462dc604b26b4e43a406df17 Mon Sep 17 00:00:00 2001 From: Robert Holmes <robeholmes@gmail.com> Date: Tue, 23 Apr 2019 07:39:29 +0000 Subject: [PATCH] KEYS: Make use of platform keyring for module signature @@ -25,7 +25,7 @@ index 9d9fc678c91d..84ad75a53c83 100644 @@ -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, @@ -40,5 +40,5 @@ index 9d9fc678c91d..84ad75a53c83 100644 + return ret; } -- -2.26.0 +2.26.2 |