From: Mark Wielaard <mark@klomp.org>
To: elfutils-devel@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [PATCH] elfcompress: Add sanity checks to make sure to not override variable
Date: Tue, 10 May 2022 12:35:01 +0200 [thread overview]
Message-ID: <20220510103501.30432-1-mark@klomp.org> (raw)
The process_file code is a little tricky. Add sanity checks to make
sure shstrtab_name, shstrtab_newname and symstrents are only set once.
Signed-off-by: Mark Wielaard <mark@klomp.org>
---
src/ChangeLog | 5 +++++
src/elfcompress.c | 24 ++++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/src/ChangeLog b/src/ChangeLog
index b978f9ef..d08381e8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2022-05-10 Mark Wielaard <mark@klomp.org>
+
+ * elfcompress.c (process_file): Sanity check shstrtab_name,
+ shstrtab_newname and symstrents are only set once.
+
2022-05-09 Mark Wielaard <mark@klomp.org>
* strip.c (remove_debug_relocations): Check gelf_getshdr, gelf_getrela,
diff --git a/src/elfcompress.c b/src/elfcompress.c
index 92f2fac8..6f18e47d 100644
--- a/src/elfcompress.c
+++ b/src/elfcompress.c
@@ -730,6 +730,15 @@ process_file (const char *fname)
{
shstrtab_size = size;
shstrtab_compressed = T_COMPRESS_GNU;
+ if (shstrtab_name != NULL
+ || shstrtab_newname != NULL)
+ {
+ error (0, 0, "Internal error,"
+ " shstrtab_name already set,"
+ " while handling section [%zd] %s",
+ ndx, sname);
+ goto cleanup;
+ }
shstrtab_name = xstrdup (sname);
shstrtab_newname = xstrdup (newname);
}
@@ -786,6 +795,15 @@ process_file (const char *fname)
{
shstrtab_size = size;
shstrtab_compressed = T_COMPRESS_ZLIB;
+ if (shstrtab_name != NULL
+ || shstrtab_newname != NULL)
+ {
+ error (0, 0, "Internal error,"
+ " shstrtab_name already set,"
+ " while handling section [%zd] %s",
+ ndx, sname);
+ goto cleanup;
+ }
shstrtab_name = xstrdup (sname);
shstrtab_newname = (newname == NULL
? NULL : xstrdup (newname));
@@ -919,6 +937,12 @@ process_file (const char *fname)
}
size_t elsize = gelf_fsize (elfnew, ELF_T_SYM, 1, EV_CURRENT);
size_t syms = symd->d_size / elsize;
+ if (symstrents != NULL)
+ {
+ error (0, 0, "Internal error, symstrents already set,"
+ " while handling section [%zd] %s", ndx, name);
+ goto cleanup;
+ }
symstrents = xmalloc (syms * sizeof (Dwelf_Strent *));
for (size_t i = 0; i < syms; i++)
{
--
2.18.4
next reply other threads:[~2022-05-10 10:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 10:35 Mark Wielaard [this message]
2022-05-14 13:14 ` 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=20220510103501.30432-1-mark@klomp.org \
--to=mark@klomp.org \
--cc=elfutils-devel@sourceware.org \
/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).