From: Peter Zijlstra peterz@infradead.org
One should only use st_shndx when >SHN_UNDEF and <SHN_LORESERVE. When SHN_XINDEX, then use .symtab_shndx. Otherwise use 0.
This handles the case: st_shndx >= SHN_LORESERVE && st_shndx != SHN_XINDEX.
Link: https://lkml.kernel.org/r/YL9HxEc/l0yrl5o8@hirez.programming.kicks-ass.net
Cc: stable@vger.kernel.org Fixes: 4ef57b21d6fb4 ("recordmcount: support >64k sections") Reported-by: Mark-PK Tsai mark-pk.tsai@mediatek.com Tested-by: Mark-PK Tsai mark-pk.tsai@mediatek.com Acked-by: Ard Biesheuvel ardb@kernel.org Signed-off-by: Peter Zijlstra (Intel) peterz@infradead.org Signed-off-by: Steven Rostedt (VMware) rostedt@goodmis.org --- scripts/recordmcount.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h index f9b19524da11..7e8a11ed5e2f 100644 --- a/scripts/recordmcount.h +++ b/scripts/recordmcount.h @@ -194,13 +194,18 @@ static unsigned int get_symindex(Elf_Sym const *sym, Elf32_Word const *symtab, unsigned long offset; int index;
- if (sym->st_shndx != SHN_XINDEX) + if (sym->st_shndx > SHN_UNDEF && + sym->st_shndx < SHN_LORESERVE) return w2(sym->st_shndx);
- offset = (unsigned long)sym - (unsigned long)symtab; - index = offset / sizeof(*sym); + if (sym->st_shndx == SHN_XINDEX) { + offset = (unsigned long)sym - (unsigned long)symtab; + index = offset / sizeof(*sym);
- return w(symtab_shndx[index]); + return w(symtab_shndx[index]); + } + + return 0; }
static unsigned int get_shnum(Elf_Ehdr const *ehdr, Elf_Shdr const *shdr0)