1 files changed, 28 insertions, 21 deletions

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 1ec7158b6c1f..413c53693e62 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -420,11 +420,10 @@ static int parse_elf(struct elf_info *info, const char *filename)
                 return 0;
         }
 
-        if (hdr->e_shnum == 0) {
+        if (hdr->e_shnum == SHN_UNDEF) {
                 /*
                  * There are more than 64k sections,
                  * read count from .sh_size.
-                 * note: it doesn't need shndx2secindex()
                  */
                 info->num_sections = TO_NATIVE(sechdrs[0].sh_size);
         }
@@ -432,8 +431,7 @@ static int parse_elf(struct elf_info *info, const char *filename)
                 info->num_sections = hdr->e_shnum;
         }
         if (hdr->e_shstrndx == SHN_XINDEX) {
-                info->secindex_strings =
-                    shndx2secindex(TO_NATIVE(sechdrs[0].sh_link));
+                info->secindex_strings = TO_NATIVE(sechdrs[0].sh_link);
         }
         else {
                 info->secindex_strings = hdr->e_shstrndx;
@@ -489,7 +487,7 @@ static int parse_elf(struct elf_info *info, const char *filename)
                             sechdrs[i].sh_offset;
                         info->symtab_stop  = (void *)hdr +
                             sechdrs[i].sh_offset + sechdrs[i].sh_size;
-                        sh_link_idx = shndx2secindex(sechdrs[i].sh_link);
+                        sh_link_idx = sechdrs[i].sh_link;
                         info->strtab       = (void *)hdr +
                             sechdrs[sh_link_idx].sh_offset;
                 }
@@ -516,11 +514,9 @@ static int parse_elf(struct elf_info *info, const char *filename)
 
         if (symtab_shndx_idx != ~0U) {
                 Elf32_Word *p;
-                if (symtab_idx !=
-                    shndx2secindex(sechdrs[symtab_shndx_idx].sh_link))
+                if (symtab_idx != sechdrs[symtab_shndx_idx].sh_link)
                         fatal("%s: SYMTAB_SHNDX has bad sh_link: %u!=%u\n",
-                              filename,
-                              shndx2secindex(sechdrs[symtab_shndx_idx].sh_link),
+                              filename, sechdrs[symtab_shndx_idx].sh_link,
                               symtab_idx);
                 /* Fix endianness */
                 for (p = info->symtab_shndx_start; p < info->symtab_shndx_stop;
@@ -790,6 +786,7 @@ static const char *section_white_list[] =
 {
         ".comment*",
         ".debug*",
+        ".zdebug*",             /* Compressed debug sections. */
         ".GCC-command-line",    /* mn10300 */
         ".mdebug*",        /* alpha, score, mips etc. */
         ".pdr",            /* alpha, score, mips etc. */
@@ -1208,6 +1205,9 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr,
  * .cpuinit.data => __cpudata
  * .memexitconst => __memconst
  * etc.
+ *
+ * The memory of returned value has been allocated on a heap. The user of this
+ * method should free it after usage.
 */
 static char *sec2annotation(const char *s)
 {
@@ -1230,7 +1230,7 @@ static char *sec2annotation(const char *s)
                         strcat(p, "data ");
                 else
                         strcat(p, " ");
-                return r; /* we leak her but we do not care */
+                return r;
         } else {
                 return strdup("");
         }
@@ -1244,6 +1244,19 @@ static int is_function(Elf_Sym *sym)
                 return -1;
 }
 
+static void print_section_list(const char * const list[20])
+{
+        const char *const *s = list;
+
+        while (*s) {
+                fprintf(stderr, "%s", *s);
+                s++;
+                if (*s)
+                        fprintf(stderr, ", ");
+        }
+        fprintf(stderr, "\n");
+}
+
 /*
  * Print a warning about a section mismatch.
  * Try to find symbols near it so user can find it.
@@ -1300,7 +1313,6 @@ static void report_sec_mismatch(const char *modname,
                 break;
         case DATA_TO_ANY_INIT: {
                 prl_to = sec2annotation(tosec);
-                const char *const *s = mismatch->symbol_white_list;
                 fprintf(stderr,
                 "The variable %s references\n"
                 "the %s %s%s%s\n"
@@ -1308,9 +1320,7 @@ static void report_sec_mismatch(const char *modname,
                 "variable with __init* or __refdata (see linux/init.h) "
                 "or name the variable:\n",
                 fromsym, to, prl_to, tosym, to_p);
-                while (*s)
-                        fprintf(stderr, "%s, ", *s++);
-                fprintf(stderr, "\n");
+                print_section_list(mismatch->symbol_white_list);
                 free(prl_to);
                 break;
         }
@@ -1325,7 +1335,6 @@ static void report_sec_mismatch(const char *modname,
                 break;
         case DATA_TO_ANY_EXIT: {
                 prl_to = sec2annotation(tosec);
-                const char *const *s = mismatch->symbol_white_list;
                 fprintf(stderr,
                 "The variable %s references\n"
                 "the %s %s%s%s\n"
@@ -1333,9 +1342,7 @@ static void report_sec_mismatch(const char *modname,
                 "variable with __exit* (see linux/init.h) or "
                 "name the variable:\n",
                 fromsym, to, prl_to, tosym, to_p);
-                while (*s)
-                        fprintf(stderr, "%s, ", *s++);
-                fprintf(stderr, "\n");
+                print_section_list(mismatch->symbol_white_list);
                 free(prl_to);
                 break;
         }
@@ -1435,10 +1442,10 @@ static unsigned int *reloc_location(struct elf_info *elf,
                                     Elf_Shdr *sechdr, Elf_Rela *r)
 {
         Elf_Shdr *sechdrs = elf->sechdrs;
-        int section = shndx2secindex(sechdr->sh_info);
+        int section = sechdr->sh_info;
 
         return (void *)elf->hdr + sechdrs[section].sh_offset +
-                r->r_offset - sechdrs[section].sh_addr;
+                r->r_offset;
 }
 
 static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
@@ -1611,7 +1618,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
  * A module includes a number of sections that are discarded
  * either when loaded or when used as built-in.
  * For loaded modules all functions marked __init and all data
- * marked __initdata will be discarded when the module has been intialized.
+ * marked __initdata will be discarded when the module has been initialized.
  * Likewise for modules used built-in the sections marked __exit
  * are discarded because __exit marked function are supposed to be called
  * only when a module is unloaded which never happens for built-in modules.