summaryrefslogtreecommitdiffstats
path: root/certs
diff options
context:
space:
mode:
authorYannik Sembritzki <yannik@sembritzki.me>2018-08-16 14:05:10 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-09 19:55:54 +0200
commitf70805bef73eda436ad664deab818b3291cc8407 (patch)
tree1a13852f239bbd98f71127c0a2b3ae085d25ab33 /certs
parent9cbb32610233e3531ec74e17b44d702c1ca353f0 (diff)
downloadlinux-stable-f70805bef73eda436ad664deab818b3291cc8407.tar.gz
linux-stable-f70805bef73eda436ad664deab818b3291cc8407.tar.bz2
linux-stable-f70805bef73eda436ad664deab818b3291cc8407.zip
Replace magic for trusting the secondary keyring with #define
commit 817aef260037f33ee0f44c17fe341323d3aebd6d upstream. Replace the use of a magic number that indicates that verify_*_signature() should use the secondary keyring with a symbol. Signed-off-by: Yannik Sembritzki <yannik@sembritzki.me> Signed-off-by: David Howells <dhowells@redhat.com> Cc: keyrings@vger.kernel.org Cc: linux-security-module@vger.kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'certs')
-rw-r--r--certs/system_keyring.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/certs/system_keyring.c b/certs/system_keyring.c
index 6251d1b27f0c..81728717523d 100644
--- a/certs/system_keyring.c
+++ b/certs/system_keyring.c
@@ -15,6 +15,7 @@
#include <linux/cred.h>
#include <linux/err.h>
#include <linux/slab.h>
+#include <linux/verification.h>
#include <keys/asymmetric-type.h>
#include <keys/system_keyring.h>
#include <crypto/pkcs7.h>
@@ -230,7 +231,7 @@ int verify_pkcs7_signature(const void *data, size_t len,
if (!trusted_keys) {
trusted_keys = builtin_trusted_keys;
- } else if (trusted_keys == (void *)1UL) {
+ } else if (trusted_keys == VERIFY_USE_SECONDARY_KEYRING) {
#ifdef CONFIG_SECONDARY_TRUSTED_KEYRING
trusted_keys = secondary_trusted_keys;
#else