* [PATCH v4] recordmcount: Correct st_shndx handling
@ 2021-06-16 15:41 Mark-PK Tsai
2021-06-16 16:02 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Mark-PK Tsai @ 2021-06-16 15:41 UTC (permalink / raw)
To: peterz
Cc: linux-arm-kernel, linux-kernel, linux-mediatek, mark-pk.tsai,
matthias.bgg, mhelsley, rostedt, samitolvanen, yj.chiang
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.
Reported-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
[handle endianness of sym->st_shndx]
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
---
scripts/recordmcount.h | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index f9b19524da11..1e9baa5c4fc6 100644
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -192,15 +192,20 @@ static unsigned int get_symindex(Elf_Sym const *sym, Elf32_Word const *symtab,
Elf32_Word const *symtab_shndx)
{
unsigned long offset;
+ unsigned short shndx = w2(sym->st_shndx);
int index;
- if (sym->st_shndx != SHN_XINDEX)
- return w2(sym->st_shndx);
+ if (shndx > SHN_UNDEF && shndx < SHN_LORESERVE)
+ return shndx;
- offset = (unsigned long)sym - (unsigned long)symtab;
- index = offset / sizeof(*sym);
+ if (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)
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v4] recordmcount: Correct st_shndx handling
2021-06-16 15:41 [PATCH v4] recordmcount: Correct st_shndx handling Mark-PK Tsai
@ 2021-06-16 16:02 ` Steven Rostedt
2021-06-17 0:23 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Steven Rostedt @ 2021-06-16 16:02 UTC (permalink / raw)
To: Mark-PK Tsai
Cc: peterz, linux-arm-kernel, linux-kernel, linux-mediatek,
matthias.bgg, mhelsley, samitolvanen, yj.chiang
On Wed, 16 Jun 2021 23:41:26 +0800
Mark-PK Tsai <mark-pk.tsai@mediatek.com> wrote:
> 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.
>
> Reported-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> Tested-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
> [handle endianness of sym->st_shndx]
> Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
> ---
Thanks, I pulled this in and started the testing.
-- Steve
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v4] recordmcount: Correct st_shndx handling
2021-06-16 16:02 ` Steven Rostedt
@ 2021-06-17 0:23 ` Steven Rostedt
0 siblings, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2021-06-17 0:23 UTC (permalink / raw)
To: Mark-PK Tsai
Cc: peterz, linux-arm-kernel, linux-kernel, linux-mediatek,
matthias.bgg, mhelsley, samitolvanen, yj.chiang
On Wed, 16 Jun 2021 12:02:27 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Wed, 16 Jun 2021 23:41:26 +0800
> Mark-PK Tsai <mark-pk.tsai@mediatek.com> wrote:
>
> > 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.
> >
> > Reported-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
> > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> > Tested-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
> > [handle endianness of sym->st_shndx]
> > Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
> > ---
>
> Thanks, I pulled this in and started the testing.
>
It passed my normal tests. I'll run my cross compile test, and I just
pushed it to linux-next. I'll wait a few days before I push it to Linus.
-- Steve
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-17 0:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-16 15:41 [PATCH v4] recordmcount: Correct st_shndx handling Mark-PK Tsai
2021-06-16 16:02 ` Steven Rostedt
2021-06-17 0:23 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).