From: Mark Wielaard <mark@klomp.org>
To: debugedit@sourceware.org
Cc: Tom Stellard <tstellar@redhat.com>, Mark Wielaard <mark@klomp.org>
Subject: [PATCH] debugedit: Skip relocations with missing symbol/section offset.
Date: Thu, 1 Jul 2021 12:05:19 +0200 [thread overview]
Message-ID: <20210701100519.321801-1-mark@klomp.org> (raw)
We tried to handle relocations that didn't have a symbol associated
with any section. The would cause a message like: "Unhandled
relocation 1 in .debug_info section". Which wasn't that helpful
either. So skip relocations without an associated symbol section index
and improve the error message a little.
* debugedit.c (setup_relbuf): Continue when sym.st_shndx == 0.
Add relocation index to error message.
Signed-off-by: Mark Wielaard <mark@klomp.org>
---
tools/debugedit.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tools/debugedit.c b/tools/debugedit.c
index c6975b2..d0c6371 100644
--- a/tools/debugedit.c
+++ b/tools/debugedit.c
@@ -561,10 +561,11 @@ setup_relbuf (DSO *dso, debug_section *sec, int *reltype)
continue;
/* Only consider relocations against .debug_str, .debug_line,
.debug_line_str, and .debug_abbrev. */
- if (sym.st_shndx != debug_sections[DEBUG_STR].sec
- && sym.st_shndx != debug_sections[DEBUG_LINE].sec
- && sym.st_shndx != debug_sections[DEBUG_LINE_STR].sec
- && sym.st_shndx != debug_sections[DEBUG_ABBREV].sec)
+ if (sym.st_shndx == 0 ||
+ (sym.st_shndx != debug_sections[DEBUG_STR].sec
+ && sym.st_shndx != debug_sections[DEBUG_LINE].sec
+ && sym.st_shndx != debug_sections[DEBUG_LINE_STR].sec
+ && sym.st_shndx != debug_sections[DEBUG_ABBREV].sec))
continue;
rela.r_addend += sym.st_value;
rtype = ELF64_R_TYPE (rela.r_info);
@@ -625,8 +626,8 @@ setup_relbuf (DSO *dso, debug_section *sec, int *reltype)
#endif
default:
fail:
- error (1, 0, "%s: Unhandled relocation %d in %s section",
- dso->filename, rtype, sec->name);
+ error (1, 0, "%s: Unhandled relocation %d at [%d] for %s section",
+ dso->filename, rtype, ndx, sec->name);
}
relend->ptr = sec->data
+ (rela.r_offset - base);
--
2.32.0
next reply other threads:[~2021-07-01 10:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-01 10:05 Mark Wielaard [this message]
2021-07-01 20:12 ` Tom Stellard
2021-07-05 14:38 ` Mark Wielaard
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=20210701100519.321801-1-mark@klomp.org \
--to=mark@klomp.org \
--cc=debugedit@sourceware.org \
--cc=tstellar@redhat.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).