summaryrefslogtreecommitdiffstats
path: root/kernel/module-internal.h
diff options
context:
space:
mode:
authorJessica Yu <jeyu@kernel.org>2018-06-29 16:37:08 +0200
committerJessica Yu <jeyu@kernel.org>2018-07-02 11:36:17 +0200
commitf314dfea16a085a58d2ff227ea9fa9e490ee5d18 (patch)
treec203005916d88e491f9cf333929ca9830a84277d /kernel/module-internal.h
parentmodule: replace VMLINUX_SYMBOL_STR() with __stringify() or string literal (diff)
downloadlinux-f314dfea16a085a58d2ff227ea9fa9e490ee5d18.tar.xz
linux-f314dfea16a085a58d2ff227ea9fa9e490ee5d18.zip
modsign: log module name in the event of an error
Now that we have the load_info struct all initialized (including info->name, which contains the name of the module) before module_sig_check(), make the load_info struct and hence module name available to mod_verify_sig() so that we can log the module name in the event of an error. Signed-off-by: Jessica Yu <jeyu@kernel.org>
Diffstat (limited to 'kernel/module-internal.h')
-rw-r--r--kernel/module-internal.h25
1 files changed, 24 insertions, 1 deletions
diff --git a/kernel/module-internal.h b/kernel/module-internal.h
index 915e123a430f..79c9be2dbbe9 100644
--- a/kernel/module-internal.h
+++ b/kernel/module-internal.h
@@ -9,4 +9,27 @@
* 2 of the Licence, or (at your option) any later version.
*/
-extern int mod_verify_sig(const void *mod, unsigned long *_modlen);
+#include <linux/elf.h>
+#include <asm/module.h>
+
+struct load_info {
+ const char *name;
+ /* pointer to module in temporary copy, freed at end of load_module() */
+ struct module *mod;
+ Elf_Ehdr *hdr;
+ unsigned long len;
+ Elf_Shdr *sechdrs;
+ char *secstrings, *strtab;
+ unsigned long symoffs, stroffs;
+ struct _ddebug *debug;
+ unsigned int num_debug;
+ bool sig_ok;
+#ifdef CONFIG_KALLSYMS
+ unsigned long mod_kallsyms_init_off;
+#endif
+ struct {
+ unsigned int sym, str, mod, vers, info, pcpu;
+ } index;
+};
+
+extern int mod_verify_sig(const void *mod, struct load_info *info);