projects
/
musl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
731e8ff
)
use new search_vec function to find vdso in dynamic linker
author
Rich Felker
<dalias@aerifal.cx>
Sat, 25 Aug 2012 21:30:59 +0000
(17:30 -0400)
committer
Rich Felker
<dalias@aerifal.cx>
Sat, 25 Aug 2012 21:30:59 +0000
(17:30 -0400)
src/ldso/dynlink.c
patch
|
blob
|
history
diff --git
a/src/ldso/dynlink.c
b/src/ldso/dynlink.c
index
6ffda49
..
7c1bd89
100644
(file)
--- 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 */
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)) {
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;
decode_dyn(vdso);
vdso->prev = lib;
lib->next = vdso;
- break;
}
/* Initial dso chain consists only of the app. We temporarily
}
/* Initial dso chain consists only of the app. We temporarily