Merge tag 'modules-for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

Pull modules updates from Jessica Yu:
 "Summary of modules changes for the 4.11 merge window:

   - A few small code cleanups

   - Add modules git tree url to MAINTAINERS"

* tag 'modules-for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  MAINTAINERS: add tree for modules
  module: fix memory leak on early load_module() failures
  module: Optimize search_module_extables()
  modules: mark __inittest/__exittest as __maybe_unused
  livepatch/module: print notice of TAINT_LIVEPATCH
  module: Drop redundant declaration of struct module

3 files changed, 20 insertions, 17 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 545633d6663d..7757bef14951 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8364,6 +8364,7 @@ F:	drivers/media/dvb-frontends/mn88473*
 MODULE SUPPORT
 M:      Jessica Yu <jeyu@redhat.com>
 M:      Rusty Russell <rusty@rustcorp.com.au>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
 S:      Maintained
 F:      include/linux/module.h
 F:      kernel/module.c
diff --git a/include/linux/module.h b/include/linux/module.h
index f4f542ed3d92..0297c5cd7cdf 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -126,13 +126,13 @@ extern void cleanup_module(void);
 
 /* Each module must use one module_init(). */
 #define module_init(initfn)                                     \
-        static inline initcall_t __inittest(void)               \
+        static inline initcall_t __maybe_unused __inittest(void)                \
         { return initfn; }                                      \
         int init_module(void) __attribute__((alias(#initfn)));
 
 /* This is only required if you want to be unloadable. */
 #define module_exit(exitfn)                                     \
-        static inline exitcall_t __exittest(void)               \
+        static inline exitcall_t __maybe_unused __exittest(void)                \
         { return exitfn; }                                      \
         void cleanup_module(void) __attribute__((alias(#exitfn)));
 
@@ -281,8 +281,6 @@ enum module_state {
         MODULE_STATE_UNFORMED,  /* Still setting it up. */
 };
 
-struct module;
-
 struct mod_tree_node {
         struct module *mod;
         struct latch_tree_node node;
diff --git a/kernel/module.c b/kernel/module.c
index a3889169a3ae..7eba6dea4f41 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2811,6 +2811,8 @@ static int check_modinfo_livepatch(struct module *mod, struct load_info *info)
         if (get_modinfo(info, "livepatch")) {
                 mod->klp = true;
                 add_taint_module(mod, TAINT_LIVEPATCH, LOCKDEP_STILL_OK);
+                pr_notice_once("%s: tainting kernel with TAINT_LIVEPATCH\n",
+                               mod->name);
         }
 
         return 0;
@@ -3723,6 +3725,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
         mod_sysfs_teardown(mod);
  coming_cleanup:
         mod->state = MODULE_STATE_GOING;
+        destroy_params(mod->kp, mod->num_kp);
         blocking_notifier_call_chain(&module_notify_list,
                                      MODULE_STATE_GOING, mod);
         klp_module_going(mod);
@@ -4169,22 +4172,23 @@ const struct exception_table_entry *search_module_extables(unsigned long addr)
         struct module *mod;
 
         preempt_disable();
-        list_for_each_entry_rcu(mod, &modules, list) {
-                if (mod->state == MODULE_STATE_UNFORMED)
-                        continue;
-                if (mod->num_exentries == 0)
-                        continue;
+        mod = __module_address(addr);
+        if (!mod)
+                goto out;
 
-                e = search_extable(mod->extable,
-                                   mod->extable + mod->num_exentries - 1,
-                                   addr);
-                if (e)
-                        break;
-        }
+        if (!mod->num_exentries)
+                goto out;
+
+        e = search_extable(mod->extable,
+                           mod->extable + mod->num_exentries - 1,
+                           addr);
+out:
         preempt_enable();
 
-        /* Now, if we found one, we are running inside it now, hence
-           we cannot unload the module, hence no refcnt needed. */
+        /*
+         * Now, if we found one, we are running inside it now, hence
+         * we cannot unload the module, hence no refcnt needed.
+         */
         return e;
 }