iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

recordmcount: Correct st_shndx handling

Browse Source 
[ Upstream commit fb780761e7 ]

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://lore.kernel.org/lkml/20210607023839.26387-1-mark-pk.tsai@mediatek.com/
Link: https://lkml.kernel.org/r/20210616154126.2794-1-mark-pk.tsai@mediatek.com

Reported-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
Tested-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
[handle endianness of sym->st_shndx]
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Peter Zijlstra
2021-06-16 23:41:26 +08:00
committed by Sasha Levin
parent fb71d81ccd
commit d91c50e6a6
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/recordmcount.h
View File

@ -192,15 +192,20 @@ static unsigned int get_symindex(Elf_Sym const *sym, Elf32_Word const *symtab,
Elf32_Word const *symtab_shndx) Elf32_Word const *symtab_shndx)
{ {
unsigned long offset; unsigned long offset;
unsigned short shndx = w2(sym->st_shndx);
int index; int index;
if (sym->st_shndx != SHN_XINDEX) if (shndx > SHN_UNDEF && shndx < SHN_LORESERVE)
return w2(sym->st_shndx); return shndx;
offset = (unsigned long)sym - (unsigned long)symtab; if (shndx == SHN_XINDEX) {
index = offset / sizeof(*sym); 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) static unsigned int get_shnum(Elf_Ehdr const *ehdr, Elf_Shdr const *shdr0)