aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/module_signing.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2013-08-30 15:07:30 (GMT)
committerDavid Howells <dhowells@redhat.com>2013-09-25 16:17:01 (GMT)
commitb56e5a17b6b9acd16997960504b9940d0d7984e7 (patch)
tree3041aadaf0eb3e79c0a5d1e7f9715489340f868a /kernel/module_signing.c
parent0fbd39cf7ffe3b6a787b66b672d21b84e4675352 (diff)
downloadkernel_replicant_linux-b56e5a17b6b9acd16997960504b9940d0d7984e7.zip
kernel_replicant_linux-b56e5a17b6b9acd16997960504b9940d0d7984e7.tar.gz
kernel_replicant_linux-b56e5a17b6b9acd16997960504b9940d0d7984e7.tar.bz2
KEYS: Separate the kernel signature checking keyring from module signing
Separate the kernel signature checking keyring from module signing so that it can be used by code other than the module-signing code. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'kernel/module_signing.c')
-rw-r--r--kernel/module_signing.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/module_signing.c b/kernel/module_signing.c
index ee47640..0b6b870 100644
--- a/kernel/module_signing.c
+++ b/kernel/module_signing.c
@@ -14,6 +14,7 @@
#include <crypto/public_key.h>
#include <crypto/hash.h>
#include <keys/asymmetric-type.h>
+#include <keys/system_keyring.h>
#include "module-internal.h"
/*
@@ -157,7 +158,7 @@ static struct key *request_asymmetric_key(const char *signer, size_t signer_len,
pr_debug("Look up: \"%s\"\n", id);
- key = keyring_search(make_key_ref(modsign_keyring, 1),
+ key = keyring_search(make_key_ref(system_trusted_keyring, 1),
&key_type_asymmetric, id);
if (IS_ERR(key))
pr_warn("Request for unknown module key '%s' err %ld\n",