diff options
| author | Bobby Bingham <koorogi@koorogi.info> | 2016-07-25 22:52:58 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2016-11-11 12:58:27 -0500 |
| commit | 54482898abe8d6d937ee67ea5974cd8eae859c37 (patch) | |
| tree | 400a5d1fbfee1cb3b90f3a215f3da7b771dca3c9 | |
| parent | b418ea1b66d0d5a08640d4edf3b65d4619c6ef7f (diff) | |
| download | musl-54482898abe8d6d937ee67ea5974cd8eae859c37.tar.gz | |
treat null vdso base same as missing
On s390x, the kernel provides AT_SYSINFO_EHDR, but sets it to zero, if the
program being run does not have a program interpreter. This causes
problems when running the dynamic linker directly.
| -rw-r--r-- | ldso/dynlink.c | 2 | ||||
| -rw-r--r-- | src/internal/vdso.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ldso/dynlink.c b/ldso/dynlink.c index ad49cac2..c6890845 100644 --- a/ldso/dynlink.c +++ b/ldso/dynlink.c @@ -1550,7 +1550,7 @@ _Noreturn void __dls3(size_t *sp) } /* Attach to vdso, if provided by the kernel */ - if (search_vec(auxv, &vdso_base, AT_SYSINFO_EHDR)) { + if (search_vec(auxv, &vdso_base, AT_SYSINFO_EHDR) && vdso_base) { Ehdr *ehdr = (void *)vdso_base; Phdr *phdr = vdso.phdr = (void *)(vdso_base + ehdr->e_phoff); vdso.phnum = ehdr->e_phnum; diff --git a/src/internal/vdso.c b/src/internal/vdso.c index a4862171..d46d3228 100644 --- a/src/internal/vdso.c +++ b/src/internal/vdso.c @@ -45,6 +45,7 @@ void *__vdsosym(const char *vername, const char *name) size_t i; for (i=0; libc.auxv[i] != AT_SYSINFO_EHDR; i+=2) if (!libc.auxv[i]) return 0; + if (!libc.auxv[i+1]) return 0; Ehdr *eh = (void *)libc.auxv[i+1]; Phdr *ph = (void *)((char *)eh + eh->e_phoff); size_t *dynv=0, base=-1; |