From: Josh Poimboeuf <jpoimboe@redhat.com>
To: Vanessa Hack <vanessa.hack@fau.de>
Cc: Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org,
Jonas Rabenstein <rabenstein@cs.fau.de>
Subject: Re: [PATCH] objtool: include symbol value in check for contiguous objects
Date: Mon, 3 May 2021 12:28:14 -0500 [thread overview]
Message-ID: <20210503172814.suquyqr737ogn4ef@treble> (raw)
In-Reply-To: <20210428210408.4546-1-vanessa.hack@fau.de>
On Wed, Apr 28, 2021 at 11:04:08PM +0200, Vanessa Hack wrote:
> While trying to adopt objtool's ability to generate ORC data for the use
> in our research project, we came across a problem with the detection of
> function pointers of contiguous objects introduced by commit fd35c88b7417
> ("objtool: Support GCC 8 switch tables"). Only the section and the
> addend/offset of the relocation/function are compared without the actual
> value of the involved symbols - false positives might be reported if the
> referenced symbols are different, but are in the same section. By adding
> (the value of) the referenced symbol as part of the comparison, those
> false positives are no longer reported.
>
> Co-developed-by: Jonas Rabenstein <rabenstein@cs.fau.de>
> Signed-off-by: Jonas Rabenstein <rabenstein@cs.fau.de>
> Signed-off-by: Vanessa Hack <vanessa.hack@fau.de>
> ---
> tools/objtool/check.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tools/objtool/check.c b/tools/objtool/check.c
> index 1f4154f9b04b..4456f3278bb8 100644
> --- a/tools/objtool/check.c
> +++ b/tools/objtool/check.c
> @@ -1320,6 +1320,8 @@ static int add_jump_table(struct objtool_file *file, struct instruction *insn,
> * instruction.
> */
> list_for_each_entry_from(reloc, &table->sec->reloc_list, list) {
> + unsigned int pfunc_offset;
> + unsigned int reloc_offset;
>
> /* Check for the end of the table: */
> if (reloc != table && reloc->jump_table_start)
> @@ -1330,8 +1332,10 @@ static int add_jump_table(struct objtool_file *file, struct instruction *insn,
> break;
>
> /* Detect function pointers from contiguous objects: */
> + pfunc_offset = pfunc->sym.st_value + pfunc->offset;
> + reloc_offset = reloc->sym->sym.st_value + reloc->addend;
> if (reloc->sym->sec == pfunc->sec &&
> - reloc->addend == pfunc->offset)
> + pfunc_offset == reloc_offset)
> break;
Hi Vanessa & Jonas,
Thanks for the patch!
I'm a little confused about the issue -- do you have an example listing
of .rodata relocations (e.g. from 'readelf -aW') which confused objtool?
I believe add_jump_table() -- in addition to all the other jump table
code -- assumes that reloc->sym is a section symbol (STT_SECTION),
rather than a function symbol (STT_FUNC). Was it an STT_FUNC symbol
which caused the problem?
Also I'm not quite convinced this patch is the right fix. For the
'pfunc_offset' calculation, I believe 'pfunc->sym.st_value' is the same
value as 'pfunc->offset' -- they both represent the function's section
offset. So it's basically adding pfunc->offset to itself, right? Is
that intentional?
Any chance this patch fixes your issue? If not, the above readelf would
help me understand it more.
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 5e5388a38e2a..4f30a763a4e3 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1344,6 +1344,10 @@ static int add_jump_table(struct objtool_file *file, struct instruction *insn,
if (prev_offset && reloc->offset != prev_offset + 8)
break;
+ /* Jump table relocs are always STT_SECTION: */
+ if (reloc->sym->type != STT_SECTION)
+ break;
+
/* Detect function pointers from contiguous objects: */
if (reloc->sym->sec == pfunc->sec &&
reloc->addend == pfunc->offset)
next parent reply other threads:[~2021-05-03 17:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210428210408.4546-1-vanessa.hack@fau.de>
2021-05-03 17:28 ` Josh Poimboeuf [this message]
2021-05-17 15:47 ` [PATCH] objtool: include symbol value in check for contiguous objects Vanessa Hack
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210503172814.suquyqr737ogn4ef@treble \
--to=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rabenstein@cs.fau.de \
--cc=vanessa.hack@fau.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).