* [PATCH v2] recordmcount: Correct st_shndx handling
@ 2021-06-15 6:47 Mark-PK Tsai
2021-06-15 15:42 ` Steven Rostedt
0 siblings, 1 reply; 4+ messages in thread
From: Mark-PK Tsai @ 2021-06-15 6:47 UTC (permalink / raw)
To: rostedt
Cc: Matthias Brugger, Matt Helsley, Sami Tolvanen, Mark-PK Tsai,
peterz, linux-kernel, linux-arm-kernel, linux-mediatek,
yj.chiang
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>
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
---
scripts/recordmcount.h | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index f9b19524da11..ef9c3425f86b 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 (w2(sym->st_shndx) > SHN_UNDEF &&
+ w2(sym->st_shndx) < SHN_LORESERVE)
return w2(sym->st_shndx);
- offset = (unsigned long)sym - (unsigned long)symtab;
- index = offset / sizeof(*sym);
+ if (w2(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)
--
2.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] recordmcount: Correct st_shndx handling
2021-06-15 6:47 [PATCH v2] recordmcount: Correct st_shndx handling Mark-PK Tsai
@ 2021-06-15 15:42 ` Steven Rostedt
2021-06-15 16:32 ` Mark-PK Tsai
0 siblings, 1 reply; 4+ messages in thread
From: Steven Rostedt @ 2021-06-15 15:42 UTC (permalink / raw)
To: Mark-PK Tsai
Cc: Matthias Brugger, Matt Helsley, Sami Tolvanen, peterz,
linux-kernel, linux-arm-kernel, linux-mediatek, yj.chiang
On Tue, 15 Jun 2021 14:47:20 +0800
Mark-PK Tsai <mark-pk.tsai@mediatek.com> wrote:
> 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>
> Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
Please explain the two signed-off-by's above. If you are just tweaking
Peter's original patch, please add at the start:
From: Peter Zijlstra (Intel) <peterz@infradead.org>
And then just above your signed off by, add what you changed:
Tested-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
[ Changed something ]
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
But state what you changed.
Thanks!
-- Steve
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] recordmcount: Correct st_shndx handling
2021-06-15 15:42 ` Steven Rostedt
@ 2021-06-15 16:32 ` Mark-PK Tsai
2021-06-15 17:07 ` Steven Rostedt
0 siblings, 1 reply; 4+ messages in thread
From: Mark-PK Tsai @ 2021-06-15 16:32 UTC (permalink / raw)
To: rostedt
Cc: linux-arm-kernel, linux-kernel, linux-mediatek, mark-pk.tsai,
matthias.bgg, mhelsley, peterz, samitolvanen, yj.chiang
> On Tue, 15 Jun 2021 14:47:20 +0800
> Mark-PK Tsai <mark-pk.tsai@mediatek.com> wrote:
>
> > 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>
> > Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
>
> Please explain the two signed-off-by's above. If you are just tweaking
> Peter's original patch, please add at the start:
>
> From: Peter Zijlstra (Intel) <peterz@infradead.org>
>
> And then just above your signed off by, add what you changed:
>
> Tested-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
> [ Changed something ]
> Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
>
> But state what you changed.
>
> Thanks!
>
> -- Steve
Sorry for messing up.
I've fixed it in v3.
Thanks for your comment.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] recordmcount: Correct st_shndx handling
2021-06-15 16:32 ` Mark-PK Tsai
@ 2021-06-15 17:07 ` Steven Rostedt
0 siblings, 0 replies; 4+ messages in thread
From: Steven Rostedt @ 2021-06-15 17:07 UTC (permalink / raw)
To: Mark-PK Tsai
Cc: linux-arm-kernel, linux-kernel, linux-mediatek, matthias.bgg,
mhelsley, peterz, samitolvanen, yj.chiang
On Wed, 16 Jun 2021 00:32:45 +0800
Mark-PK Tsai <mark-pk.tsai@mediatek.com> wrote:
> > On Tue, 15 Jun 2021 14:47:20 +0800
> > Mark-PK Tsai <mark-pk.tsai@mediatek.com> wrote:
> >
> > > 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>
> > > Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
> >
> > Please explain the two signed-off-by's above. If you are just tweaking
> > Peter's original patch, please add at the start:
> >
> > From: Peter Zijlstra (Intel) <peterz@infradead.org>
> >
> > And then just above your signed off by, add what you changed:
> >
> > Tested-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
> > [ Changed something ]
> > Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
> >
> > But state what you changed.
> >
> > Thanks!
> >
> > -- Steve
>
> Sorry for messing up.
No problem. It's a learning process.
> I've fixed it in v3.
Thanks,
-- Steve
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-15 17:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-15 6:47 [PATCH v2] recordmcount: Correct st_shndx handling Mark-PK Tsai
2021-06-15 15:42 ` Steven Rostedt
2021-06-15 16:32 ` Mark-PK Tsai
2021-06-15 17:07 ` 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).