From: Markus Wichmann <nullplan@gmx.net>
To: musl@lists.openwall.com
Cc: Alexey Izbyshev <izbyshev@ispras.ru>
Subject: Re: dlsym(handle) may search in unrelated libraries
Date: Wed, 6 Feb 2019 17:02:48 +0100 [thread overview]
Message-ID: <20190206160248.GB5469@voyager> (raw)
In-Reply-To: <b400e2a8e98e3731964e0afa171185b6@ispras.ru>
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
On Wed, Feb 06, 2019 at 12:02:39AM +0300, Alexey Izbyshev wrote:
> Hello!
>
> I've discovered a bug in musl dynamic loader (tested on 1.1.21) which is
> demonstrated by the following simple example:
>
> $ cat bar.c
> int bar = 42;
> $ musl-gcc -fPIC -shared bar.c -o libbar.so
> $ cat foo.c
> extern int bar;
> int *foo = &bar;
> $ musl-gcc -fPIC -shared foo.c -L. -lbar -Wl,-rpath='$ORIGIN' -o libfoo.so
> $ cat main.c
> #include <dlfcn.h>
> #include <stdio.h>
>
> int main(void) {
> if (!dlopen("libfoo.so", RTLD_NOW))
> return 1;
> void *h = dlopen("libc.so.6", RTLD_NOW);
> printf("%p\n", dlsym(h, "bar"));
> }
> $ musl-gcc main.c -Wl,-rpath='$ORIGIN' -ldl
> $ ./a.out
> 0x7fd7ebe96020
>
In case you were wondering, your typo here doesn't change anything,
since "libc.so.6" has the prefix "libc.", which is recogized as reserved
in load_library(), and makes dlopen() return a handle to the libc.
Thankfully the patch is simple: Explicitly make ldso and vdso have no
deps. I was tempted to put this into kernel_mapped_dso(), but then I
remembered that the app is also a kernel mapped dso, and it usually does
have deps that need processing. At least, in nontrivial cases.
The attached patch should tide you over.
>
> Alexey
Ciao,
Markus
[-- Attachment #2: 0006-Make-libc-and-vdso-explicitly-have-no-deps.patch --]
[-- Type: text/x-diff, Size: 1443 bytes --]
From e823910d69ff56ffccecaa9b29fd4b67b901798a Mon Sep 17 00:00:00 2001
From: Markus Wichmann <nullplan@gmx.net>
Date: Wed, 6 Feb 2019 16:51:53 +0100
Subject: [PATCH 6/6] Make libc and vdso explicitly have no deps.
Alexey Izbyshev reported that without this, dlopen("libc.so") returns a
handle that is capable of finding every symbol in libraries loaded as
dependencies, since dso->deps == 0 usually means dependencies haven't
been loaded.
---
ldso/dynlink.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ldso/dynlink.c b/ldso/dynlink.c
index ec921dfd..6ffeca85 100644
--- a/ldso/dynlink.c
+++ b/ldso/dynlink.c
@@ -1244,6 +1244,7 @@ static void reloc_all(struct dso *p)
static void kernel_mapped_dso(struct dso *p)
{
size_t min_addr = -1, max_addr = 0, cnt;
+ static const struct dso *sentinel = 0;
Phdr *ph = p->phdr;
for (cnt = p->phnum; cnt--; ph = (void *)((char *)ph + p->phentsize)) {
if (ph->p_type == PT_DYNAMIC) {
@@ -1428,6 +1429,7 @@ hidden void __dls2(unsigned char *base, size_t *sp)
ldso.phdr = laddr(&ldso, ehdr->e_phoff);
ldso.phentsize = ehdr->e_phentsize;
kernel_mapped_dso(&ldso);
+ ldso.deps = (struct dso**)&nodeps_dummy;
decode_dyn(&ldso);
if (DL_FDPIC) makefuncdescs(&ldso);
@@ -1675,6 +1677,7 @@ _Noreturn void __dls3(size_t *sp)
vdso.prev = tail;
tail->next = &vdso;
tail = &vdso;
+ vdso.deps = (struct dso**)&nodeps_dummy;
}
for (i=0; app.dynv[i]; i+=2) {
--
2.20.1
next prev parent reply other threads:[~2019-02-06 16:02 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-05 21:02 Alexey Izbyshev
2019-02-06 13:40 ` Alexey Izbyshev
2019-02-06 16:02 ` Markus Wichmann [this message]
2019-02-06 17:02 ` Alexey Izbyshev
2019-02-06 20:25 ` Markus Wichmann
2019-02-06 21:23 ` Alexey Izbyshev
2019-02-07 5:33 ` Markus Wichmann
2019-02-07 13:42 ` Alexey Izbyshev
2019-02-07 17:43 ` Markus Wichmann
2019-02-07 20:37 ` Markus Wichmann
2019-02-07 21:29 ` Rich Felker
2019-02-07 16:54 ` Rich Felker
2019-02-07 18:36 ` Markus Wichmann
2019-02-07 18:57 ` Rich Felker
2019-02-07 20:31 ` Markus Wichmann
2019-02-07 21:33 ` Rich Felker
2019-02-07 21:37 ` Rich Felker
2019-02-08 10:19 ` A. Wilcox
2019-02-08 12:00 ` Szabolcs Nagy
2019-02-08 16:09 ` Rich Felker
2019-02-09 22:53 Alexey Izbyshev
2019-02-10 1:03 ` Rich Felker
2019-02-26 15:07 ` Rich Felker
2019-03-04 2:11 ` Rich Felker
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=20190206160248.GB5469@voyager \
--to=nullplan@gmx.net \
--cc=izbyshev@ispras.ru \
--cc=musl@lists.openwall.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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
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 NNTP newsgroup(s).