1 files changed, 16 insertions, 23 deletions

diff --git a/kernel/module.c b/kernel/module.c
index 0925c9a71975..cab4bce49c23 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1209,10 +1209,11 @@ static inline int check_modstruct_version(Elf_Shdr *sechdrs,
 
         /* Since this should be found in kernel (which can't be removed),
          * no locking is necessary. */
-        if (!find_symbol(MODULE_SYMBOL_PREFIX "module_layout", NULL,
+        if (!find_symbol(VMLINUX_SYMBOL_STR(module_layout), NULL,
                          &crc, true, false))
                 BUG();
-        return check_version(sechdrs, versindex, "module_layout", mod, crc,
+        return check_version(sechdrs, versindex,
+                             VMLINUX_SYMBOL_STR(module_layout), mod, crc,
                              NULL);
 }
 
@@ -1861,12 +1862,12 @@ static void free_module(struct module *mod)
 {
         trace_module_free(mod);
 
-        /* Delete from various lists */
-        mutex_lock(&module_mutex);
-        stop_machine(__unlink_module, mod, NULL);
-        mutex_unlock(&module_mutex);
         mod_sysfs_teardown(mod);
 
+        /* We leave it in list to prevent duplicate loads, but make sure
+         * that noone uses it while it's being deconstructed. */
+        mod->state = MODULE_STATE_UNFORMED;
+
         /* Remove dynamic debug info */
         ddebug_remove_module(mod->name);
 
@@ -1879,6 +1880,11 @@ static void free_module(struct module *mod)
         /* Free any allocated parameters. */
         destroy_params(mod->kp, mod->num_kp);
 
+        /* Now we can delete it from the lists */
+        mutex_lock(&module_mutex);
+        stop_machine(__unlink_module, mod, NULL);
+        mutex_unlock(&module_mutex);
+
         /* This may be NULL, but that's OK */
         unset_module_init_ro_nx(mod);
         module_free(mod, mod->module_init);
@@ -2425,10 +2431,10 @@ static void kmemleak_load_module(const struct module *mod,
         kmemleak_scan_area(mod, sizeof(struct module), GFP_KERNEL);
 
         for (i = 1; i < info->hdr->e_shnum; i++) {
-                const char *name = info->secstrings + info->sechdrs[i].sh_name;
-                if (!(info->sechdrs[i].sh_flags & SHF_ALLOC))
-                        continue;
-                if (!strstarts(name, ".data") && !strstarts(name, ".bss"))
+                /* Scan all writable sections that's not executable */
+                if (!(info->sechdrs[i].sh_flags & SHF_ALLOC) ||
+                    !(info->sechdrs[i].sh_flags & SHF_WRITE) ||
+                    (info->sechdrs[i].sh_flags & SHF_EXECINSTR))
                         continue;
 
                 kmemleak_scan_area((void *)info->sechdrs[i].sh_addr,
@@ -2763,24 +2769,11 @@ static void find_module_sections(struct module *mod, struct load_info *info)
         mod->trace_events = section_objs(info, "_ftrace_events",
                                          sizeof(*mod->trace_events),
                                          &mod->num_trace_events);
-        /*
-         * This section contains pointers to allocated objects in the trace
-         * code and not scanning it leads to false positives.
-         */
-        kmemleak_scan_area(mod->trace_events, sizeof(*mod->trace_events) *
-                           mod->num_trace_events, GFP_KERNEL);
 #endif
 #ifdef CONFIG_TRACING
         mod->trace_bprintk_fmt_start = section_objs(info, "__trace_printk_fmt",
                                          sizeof(*mod->trace_bprintk_fmt_start),
                                          &mod->num_trace_bprintk_fmt);
-        /*
-         * This section contains pointers to allocated objects in the trace
-         * code and not scanning it leads to false positives.
-         */
-        kmemleak_scan_area(mod->trace_bprintk_fmt_start,
-                           sizeof(*mod->trace_bprintk_fmt_start) *
-                           mod->num_trace_bprintk_fmt, GFP_KERNEL);
 #endif
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
         /* sechdrs[0].sh_size is always zero */