From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH] elf: Assert range of ns argument in _dl_debug_initialize
Date: Wed, 23 Jun 2021 14:42:17 +0200 [thread overview]
Message-ID: <87y2b04us6.fsf@oldenburg.str.redhat.com> (raw)
This does not fix any bugs as such, but makes it more obvious
if _dl_debug_initialize is called with invalid arguments
(which would otherwise cause the function to clobber unrelated
data).
Tested on i686-linux-gnu and x86_64-linux-gnu.
---
elf/dl-debug.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/elf/dl-debug.c b/elf/dl-debug.c
index 2cd5f09753..85b087455e 100644
--- a/elf/dl-debug.c
+++ b/elf/dl-debug.c
@@ -16,6 +16,8 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
+#include <array_length.h>
+#include <assert.h>
#include <ldsodefs.h>
@@ -49,7 +51,11 @@ _dl_debug_initialize (ElfW(Addr) ldbase, Lmid_t ns)
if (ns == LM_ID_BASE)
r = &_r_debug;
else
- r = &GL(dl_ns)[ns]._ns_debug;
+ {
+ assert (ns >= 0);
+ assert (ns < array_length (GL (dl_ns)));
+ r = &GL(dl_ns)[ns]._ns_debug;
+ }
if (r->r_map == NULL || ldbase != 0)
{
next reply other threads:[~2021-06-23 12:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 12:42 Florian Weimer [this message]
2021-06-27 22:15 ` Carlos O'Donell
2021-06-27 22:51 ` Florian Weimer
2021-06-28 2:15 ` Carlos O'Donell
2021-06-28 8:31 ` Florian Weimer
2021-06-28 7:26 ` Andreas Schwab
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=87y2b04us6.fsf@oldenburg.str.redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@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).