1 files changed, 38 insertions, 10 deletions

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index f277e116e0eb..820eed87fb43 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -169,6 +169,7 @@ struct symbol {
         unsigned int kernel:1;     /* 1 if symbol is from kernel
                                     *  (only for external modules) **/
         unsigned int preloaded:1;  /* 1 if symbol from Module.symvers, or crc */
+        unsigned int is_static:1;  /* 1 if symbol is not global */
         enum export  export;       /* Type of export */
         char name[0];
 };
@@ -201,6 +202,7 @@ static struct symbol *alloc_symbol(const char *name, unsigned int weak,
         strcpy(s->name, name);
         s->weak = weak;
         s->next = next;
+        s->is_static = 1;
         return s;
 }
 
@@ -795,9 +797,9 @@ static int match(const char *sym, const char * const pat[])
 
                 /* "*foo*" */
                 if (*p == '*' && *endp == '*') {
-                        char *here, *bare = strndup(p + 1, strlen(p) - 2);
+                        char *bare = NOFAIL(strndup(p + 1, strlen(p) - 2));
+                        char *here = strstr(sym, bare);
 
-                        here = strstr(sym, bare);
                         free(bare);
                         if (here != NULL)
                                 return 1;
@@ -1980,6 +1982,21 @@ static void read_symbols(const char *modname)
                 handle_modversions(mod, &info, sym, symname);
                 handle_moddevtable(mod, &info, sym, symname);
         }
+
+        // check for static EXPORT_SYMBOL_* functions && global vars
+        for (sym = info.symtab_start; sym < info.symtab_stop; sym++) {
+                unsigned char bind = ELF_ST_BIND(sym->st_info);
+
+                if (bind == STB_GLOBAL || bind == STB_WEAK) {
+                        struct symbol *s =
+                                find_symbol(remove_dot(info.strtab +
+                                                       sym->st_name));
+
+                        if (s)
+                                s->is_static = 0;
+                }
+        }
+
         if (!is_vmlinux(modname) || vmlinux_section_warnings)
                 check_sec_ref(mod, modname, &info);
 
@@ -2159,7 +2176,7 @@ static void add_header(struct buffer *b, struct module *mod)
         buf_printf(b, "MODULE_INFO(name, KBUILD_MODNAME);\n");
         buf_printf(b, "\n");
         buf_printf(b, "__visible struct module __this_module\n");
-        buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
+        buf_printf(b, "__section(.gnu.linkonce.this_module) = {\n");
         buf_printf(b, "\t.name = KBUILD_MODNAME,\n");
         if (mod->has_init)
                 buf_printf(b, "\t.init = init_module,\n");
@@ -2213,8 +2230,7 @@ static int add_versions(struct buffer *b, struct module *mod)
 
         buf_printf(b, "\n");
         buf_printf(b, "static const struct modversion_info ____versions[]\n");
-        buf_printf(b, "__used\n");
-        buf_printf(b, "__attribute__((section(\"__versions\"))) = {\n");
+        buf_printf(b, "__used __section(__versions) = {\n");
 
         for (s = mod->unres; s; s = s->next) {
                 if (!s->module)
@@ -2250,10 +2266,7 @@ static void add_depends(struct buffer *b, struct module *mod)
                         s->module->seen = is_vmlinux(s->module->name);
 
         buf_printf(b, "\n");
-        buf_printf(b, "static const char __module_depends[]\n");
-        buf_printf(b, "__used\n");
-        buf_printf(b, "__attribute__((section(\".modinfo\"))) =\n");
-        buf_printf(b, "\"depends=");
+        buf_printf(b, "MODULE_INFO(depends, \"");
         for (s = mod->unres; s; s = s->next) {
                 const char *p;
                 if (!s->module)
@@ -2271,7 +2284,7 @@ static void add_depends(struct buffer *b, struct module *mod)
                 buf_printf(b, "%s%s", first ? "" : ",", p);
                 first = 0;
         }
-        buf_printf(b, "\";\n");
+        buf_printf(b, "\");\n");
 }
 
 static void add_srcversion(struct buffer *b, struct module *mod)
@@ -2369,6 +2382,7 @@ static void read_dump(const char *fname, unsigned int kernel)
                 s = sym_add_exported(symname, mod, export_no(export));
                 s->kernel    = kernel;
                 s->preloaded = 1;
+                s->is_static = 0;
                 sym_update_crc(symname, mod, crc, export_no(export));
         }
         release_file(file, size);
@@ -2425,6 +2439,7 @@ int main(int argc, char **argv)
         char *dump_write = NULL, *files_source = NULL;
         int opt;
         int err;
+        int n;
         struct ext_sym_list *extsym_iter;
         struct ext_sym_list *extsym_start = NULL;
 
@@ -2520,6 +2535,19 @@ int main(int argc, char **argv)
         if (sec_mismatch_count && sec_mismatch_fatal)
                 fatal("modpost: Section mismatches detected.\n"
                       "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n");
+        for (n = 0; n < SYMBOL_HASH_SIZE; n++) {
+                struct symbol *s = symbolhash[n];
+
+                while (s) {
+                        if (s->is_static)
+                                warn("\"%s\" [%s] is a static %s\n",
+                                     s->name, s->module->name,
+                                     export_str(s->export));
+
+                        s = s->next;
+                }
+        }
+
         free(buf.p);
 
         return err;