diff options
| author | Yannik Sembritzki <yannik@sembritzki.me> | 2018-08-16 15:05:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-16 18:57:20 +0200 |
| commit | 817aef260037f33ee0f44c17fe341323d3aebd6d (patch) | |
| tree | 8f193bce3aa82797c09874cb7ea8274f9dc2e79c /certs | |
| parent | Merge tag 'pci-v4.19-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-817aef260037f33ee0f44c17fe341323d3aebd6d.tar.xz linux-817aef260037f33ee0f44c17fe341323d3aebd6d.zip | |
Replace magic for trusting the secondary keyring with #define
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>
Diffstat (limited to 'certs')
| -rw-r--r-- | certs/system_keyring.c | 3 |
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 |