1 files changed, 171 insertions, 128 deletions

diff --git a/kernel/module.c b/kernel/module.c
index 29f2d7b33dd..c268a771595 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -68,7 +68,8 @@
 
 /* List of modules, protected by module_mutex or preempt_disable
  * (delete uses stop_machine/add uses RCU list operations). */
-static DEFINE_MUTEX(module_mutex);
+DEFINE_MUTEX(module_mutex);
+EXPORT_SYMBOL_GPL(module_mutex);
 static LIST_HEAD(modules);
 
 /* Waiting for a module to finish initializing? */
@@ -76,7 +77,7 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq);
 
 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
 
-/* Bounds of module allocation, for speeding __module_text_address */
+/* Bounds of module allocation, for speeding __module_address */
 static unsigned long module_addr_min = -1UL, module_addr_max = 0;
 
 int register_module_notifier(struct notifier_block * nb)
@@ -186,17 +187,6 @@ extern const unsigned long __start___kcrctab_unused_gpl[];
 #define symversion(base, idx) ((base != NULL) ? ((base) + (idx)) : NULL)
 #endif
 
-struct symsearch {
-        const struct kernel_symbol *start, *stop;
-        const unsigned long *crcs;
-        enum {
-                NOT_GPL_ONLY,
-                GPL_ONLY,
-                WILL_BE_GPL_ONLY,
-        } licence;
-        bool unused;
-};
-
 static bool each_symbol_in_section(const struct symsearch *arr,
                                    unsigned int arrsize,
                                    struct module *owner,
@@ -217,10 +207,8 @@ static bool each_symbol_in_section(const struct symsearch *arr,
 }
 
 /* Returns true as soon as fn returns true, otherwise false. */
-static bool each_symbol(bool (*fn)(const struct symsearch *arr,
-                                   struct module *owner,
-                                   unsigned int symnum, void *data),
-                        void *data)
+bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner,
+                            unsigned int symnum, void *data), void *data)
 {
         struct module *mod;
         const struct symsearch arr[] = {
@@ -273,6 +261,7 @@ static bool each_symbol(bool (*fn)(const struct symsearch *arr,
         }
         return false;
 }
+EXPORT_SYMBOL_GPL(each_symbol);
 
 struct find_symbol_arg {
         /* Input */
@@ -283,7 +272,7 @@ struct find_symbol_arg {
         /* Output */
         struct module *owner;
         const unsigned long *crc;
-        unsigned long value;
+        const struct kernel_symbol *sym;
 };
 
 static bool find_symbol_in_section(const struct symsearch *syms,
@@ -324,17 +313,17 @@ static bool find_symbol_in_section(const struct symsearch *syms,
 
         fsa->owner = owner;
         fsa->crc = symversion(syms->crcs, symnum);
-        fsa->value = syms->start[symnum].value;
+        fsa->sym = &syms->start[symnum];
         return true;
 }
 
-/* Find a symbol, return value, (optional) crc and (optional) module
- * which owns it */
-static unsigned long find_symbol(const char *name,
-                                 struct module **owner,
-                                 const unsigned long **crc,
-                                 bool gplok,
-                                 bool warn)
+/* Find a symbol and return it, along with, (optional) crc and
+ * (optional) module which owns it */
+const struct kernel_symbol *find_symbol(const char *name,
+                                        struct module **owner,
+                                        const unsigned long **crc,
+                                        bool gplok,
+                                        bool warn)
 {
         struct find_symbol_arg fsa;
 
@@ -347,15 +336,16 @@ static unsigned long find_symbol(const char *name,
                         *owner = fsa.owner;
                 if (crc)
                         *crc = fsa.crc;
-                return fsa.value;
+                return fsa.sym;
         }
 
         DEBUGP("Failed to find symbol %s\n", name);
-        return -ENOENT;
+        return NULL;
 }
+EXPORT_SYMBOL_GPL(find_symbol);
 
 /* Search for module by name: must hold module_mutex. */
-static struct module *find_module(const char *name)
+struct module *find_module(const char *name)
 {
         struct module *mod;
 
@@ -365,6 +355,7 @@ static struct module *find_module(const char *name)
         }
         return NULL;
 }
+EXPORT_SYMBOL_GPL(find_module);
 
 #ifdef CONFIG_SMP
 
@@ -641,7 +632,7 @@ static int already_uses(struct module *a, struct module *b)
 }
 
 /* Module a uses b */
-static int use_module(struct module *a, struct module *b)
+int use_module(struct module *a, struct module *b)
 {
         struct module_use *use;
         int no_warn, err;
@@ -674,6 +665,7 @@ static int use_module(struct module *a, struct module *b)
         no_warn = sysfs_create_link(b->holders_dir, &a->mkobj.kobj, a->name);
         return 1;
 }
+EXPORT_SYMBOL_GPL(use_module);
 
 /* Clear the unload stuff of the module. */
 static void module_unload_free(struct module *mod)
@@ -856,7 +848,7 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
         mutex_lock(&module_mutex);
         /* Store the name of the last unloaded module for diagnostic purposes */
         strlcpy(last_unloaded_module, mod->name, sizeof(last_unloaded_module));
-        unregister_dynamic_debug_module(mod->name);
+        ddebug_remove_module(mod->name);
         free_module(mod);
 
  out:
@@ -894,7 +886,7 @@ void __symbol_put(const char *symbol)
         struct module *owner;
 
         preempt_disable();
-        if (IS_ERR_VALUE(find_symbol(symbol, &owner, NULL, true, false)))
+        if (!find_symbol(symbol, &owner, NULL, true, false))
                 BUG();
         module_put(owner);
         preempt_enable();
@@ -908,8 +900,10 @@ void symbol_put_addr(void *addr)
         if (core_kernel_text((unsigned long)addr))
                 return;
 
-        if (!(modaddr = module_text_address((unsigned long)addr)))
-                BUG();
+        /* module_text_address is safe here: we're supposed to have reference
+         * to module from symbol_get, so it can't go away. */
+        modaddr = __module_text_address((unsigned long)addr);
+        BUG_ON(!modaddr);
         module_put(modaddr);
 }
 EXPORT_SYMBOL_GPL(symbol_put_addr);
@@ -949,10 +943,11 @@ static inline void module_unload_free(struct module *mod)
 {
 }
 
-static inline int use_module(struct module *a, struct module *b)
+int use_module(struct module *a, struct module *b)
 {
         return strong_try_module_get(b) == 0;
 }
+EXPORT_SYMBOL_GPL(use_module);
 
 static inline void module_unload_init(struct module *mod)