From: Florian Weimer <fweimer@redhat.com>
To: Carlos O'Donell <carlos@redhat.com>
Cc: libc-alpha <libc-alpha@sourceware.org>
Subject: Re: [PATCH] elf: Always set l in _dl_init_paths (Bug 23462).
Date: Wed, 16 Oct 2019 09:54:00 -0000 [thread overview]
Message-ID: <87d0ex6mo6.fsf@oldenburg2.str.redhat.com> (raw)
In-Reply-To: <ca723e73-c8eb-ca4c-1ca0-5fbf2b88edcd@redhat.com> (Carlos O'Donell's message of "Tue, 8 Oct 2019 20:01:49 -0400")
* Carlos O'Donell:
> diff --git a/elf/dl-load.c b/elf/dl-load.c
> index 438793e53d..903f8af13a 100644
> --- a/elf/dl-load.c
> +++ b/elf/dl-load.c
> @@ -748,50 +748,47 @@ _dl_init_paths (const char *llp)
> max_dirnamelen = SYSTEM_DIRS_MAX_LEN;
> *aelem = NULL;
>
> -#ifdef SHARED
> - /* This points to the map of the main object. */
> + /* This points to the map of the main object. It is always non-NULL
> + since we have purposely made the dynamic and static cases look the
> + same. */
> l = GL(dl_ns)[LM_ID_BASE]._ns_loaded;
> - if (l != NULL)
> + assert (l->l_type != lt_loaded);
> +
> + if (l->l_info[DT_RUNPATH])
> + {
> + /* Allocate room for the search path and fill in information
> + from RUNPATH. */
> + decompose_rpath (&l->l_runpath_dirs,
> + (const void *) (D_PTR (l, l_info[DT_STRTAB])
> + + l->l_info[DT_RUNPATH]->d_un.d_val),
> + l, "RUNPATH");
> + /* During rtld init the memory is allocated by the stub malloc,
> + prevent any attempt to free it by the normal malloc. */
> + l->l_runpath_dirs.malloced = 0;
> +
> + /* The RPATH is ignored. */
> + l->l_rpath_dirs.dirs = (void *) -1;
> + }
Does this change enable DT_RUNPATH/DT_RPATH for statically linked
binaries? Should that receive a NEWS entry and a test?
Thanks,
Florian
next prev parent reply other threads:[~2019-10-16 9:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 0:01 Carlos O'Donell
2019-10-15 16:24 ` Carlos O'Donell
2019-10-16 9:54 ` Florian Weimer [this message]
2019-10-16 11:15 ` Carlos O'Donell
2019-10-16 11:23 ` Florian Weimer
2019-10-16 13:31 ` Carlos O'Donell
2019-10-25 1:16 ` Carlos O'Donell
2019-10-25 8:37 ` Florian Weimer
2019-10-25 12:55 ` Carlos O'Donell
2021-03-05 18:25 [PATCH] elf: Always set l in _dl_init_paths (bug 23462) Florian Weimer
2021-03-08 22:26 ` Carlos O'Donell
2021-03-09 5:39 ` Navin P
2021-03-09 6:05 ` Florian Weimer
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=87d0ex6mo6.fsf@oldenburg2.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).