diff options
| author | James Morris | 2016-05-06 01:29:00 +0200 |
|---|---|---|
| committer | James Morris | 2016-05-06 01:29:00 +0200 |
| commit | 0250abcd726b4eba8a6175f09656fe544ed6491a (patch) | |
| tree | 43ded3d5f9b8b5684879c61ff6d03effdb7ea7c0 /kernel | |
| parent | Yama: use atomic allocations when reporting (diff) | |
| parent | Merge branch 'keys-trust' into keys-next (diff) | |
| download | kernel-qcow2-linux-0250abcd726b4eba8a6175f09656fe544ed6491a.tar.gz kernel-qcow2-linux-0250abcd726b4eba8a6175f09656fe544ed6491a.tar.xz kernel-qcow2-linux-0250abcd726b4eba8a6175f09656fe544ed6491a.zip | |
Merge tag 'keys-next-20160505' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module_signing.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/module_signing.c b/kernel/module_signing.c index 64b9dead4a07..937c844bee4a 100644 --- a/kernel/module_signing.c +++ b/kernel/module_signing.c @@ -12,7 +12,7 @@ #include <linux/kernel.h> #include <linux/errno.h> #include <linux/string.h> -#include <keys/system_keyring.h> +#include <linux/verification.h> #include <crypto/public_key.h> #include "module-internal.h" @@ -80,6 +80,7 @@ int mod_verify_sig(const void *mod, unsigned long *_modlen) return -EBADMSG; } - return system_verify_data(mod, modlen, mod + modlen, sig_len, - VERIFYING_MODULE_SIGNATURE); + return verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, + NULL, VERIFYING_MODULE_SIGNATURE, + NULL, NULL); } |