1 files changed, 16 insertions, 1 deletions

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 3b570b18c2e4..3648683a26c5 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -558,7 +558,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf_Addr addr,
 }
 
 /*
- * Find symbols before or equal addr and after addr - in the section sec
+ * Find symbols before or equal addr and after addr - in the section sec.
+ * If we find two symbols with equal offset prefer one with a valid name.
+ * The ELF format may have a better way to detect what type of symbol
+ * it is, but this works for now.
  **/
 static void find_symbols_between(struct elf_info *elf, Elf_Addr addr,
                                  const char *sec,
@@ -587,6 +590,12 @@ static void find_symbols_between(struct elf_info *elf, Elf_Addr addr,
                                 beforediff = addr - sym->st_value;
                                 *before = sym;
                         }
+                        else if ((addr - sym->st_value) == beforediff) {
+                                /* equal offset, valid name? */
+                                const char *name = elf->strtab + sym->st_name;
+                                if (name && strlen(name))
+                                        *before = sym;
+                        }
                 }
                 else
                 {
@@ -594,6 +603,12 @@ static void find_symbols_between(struct elf_info *elf, Elf_Addr addr,
                                 afterdiff = sym->st_value - addr;
                                 *after = sym;
                         }
+                        else if ((sym->st_value - addr) == afterdiff) {
+                                /* equal offset, valid name? */
+                                const char *name = elf->strtab + sym->st_name;
+                                if (name && strlen(name))
+                                        *after = sym;
+                        }
                 }
         }
 }