From 08b3c71410e2e4dcbb32d8c6a4fb7c4a8b20ad87 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 25 Aug 2012 17:30:59 -0400 Subject: [PATCH] use new search_vec function to find vdso in dynamic linker --- src/ldso/dynlink.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index 6ffda49c..7c1bd890 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -701,9 +701,8 @@ void *__dynlink(int argc, char **argv) decode_dyn(app); /* Attach to vdso, if provided by the kernel */ - for (i=0; auxv[i]; i+=2) { - size_t vdso_base = auxv[i+1]; - if (auxv[i] != AT_SYSINFO_EHDR) continue; + if (search_vec(auxv, aux, AT_SYSINFO_EHDR)) { + size_t vdso_base = *aux; ehdr = (void *)vdso_base; phdr = (void *)(vdso_base + ehdr->e_phoff); for (i=ehdr->e_phnum; i; i--, phdr=(void *)((char *)phdr + ehdr->e_phentsize)) { @@ -717,7 +716,6 @@ void *__dynlink(int argc, char **argv) decode_dyn(vdso); vdso->prev = lib; lib->next = vdso; - break; } /* Initial dso chain consists only of the app. We temporarily -- 2.20.1