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>

1 files changed, 1 insertions, 21 deletions

diff --git a/kernel/module.c b/kernel/module.c
index ba45a84e4287..8a45986fd728 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -307,26 +307,6 @@ int unregister_module_notifier(struct notifier_block *nb)
 }
 EXPORT_SYMBOL(unregister_module_notifier);
 
-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;
-};
-
 /*
  * We require a truly strong try_module_get(): 0 means success.
  * Otherwise an error is returned due to ongoing or failed
@@ -2778,7 +2758,7 @@ static int module_sig_check(struct load_info *info, int flags)
             memcmp(mod + info->len - markerlen, MODULE_SIG_STRING, markerlen) == 0) {
                 /* We truncate the module to discard the signature */
                 info->len -= markerlen;
-                err = mod_verify_sig(mod, &info->len);
+                err = mod_verify_sig(mod, info);
         }
 
         if (!err) {