From: Florian Weimer <fweimer@redhat.com>
To: Carlos O'Donell <carlos@redhat.com>
Cc: libc-alpha@sourceware.org
Subject: Re: [PATCH] elf: Assert range of ns argument in _dl_debug_initialize
Date: Mon, 28 Jun 2021 10:31:21 +0200 [thread overview]
Message-ID: <874kdiz8yu.fsf@oldenburg.str.redhat.com> (raw)
In-Reply-To: <251374b9-857b-b5a7-d315-6847b159923d@redhat.com> (Carlos O'Donell's message of "Sun, 27 Jun 2021 22:15:45 -0400")
* Carlos O'Donell:
> On 6/27/21 6:51 PM, Florian Weimer wrote:
>> * Carlos O'Donell:
>>
>>>> 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)));
>>>
>>> The check in _dl_map_object is:
>>> assert (nsid >= 0);
>>> assert (nsid < GL(dl_nns));
>>>
>>> Should we be consistent one way or the other?
>>
>> I wasn't sure if _dl_debug_initialize can be called with a
>> not-yet-allocated (or already-deallocated) namespace ID. _dl_map_object
>> is somewhat higher-level, so it's not surprising that it expects an
>> active ID. An out-of-bounds array access is clearly invalid, though.
>
> Assert on the tighter bound and we'll see? :-)
Do we do things this way?
I'm mainly interested in catching the LM_ID_NEWLM case, to be honest.
Thanks,
Florian
next prev parent reply other threads:[~2021-06-28 8:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 12:42 Florian Weimer
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 [this message]
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=874kdiz8yu.fsf@oldenburg.str.redhat.com \
--to=fweimer@redhat.com \
--cc=carlos@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).