diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-07-07 16:32:27 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-07-07 16:32:27 -0400 |
| commit | d93e028c6bbd491592313fc77e056f6424ea4668 (patch) | |
| tree | 5d9ccc113061da9dc431cf67613d35099546f562 | |
| parent | putw is supposed to return 0 (not the value written) on success (diff) | |
| download | grovel-d93e028c6bbd491592313fc77e056f6424ea4668.tar.gz grovel-d93e028c6bbd491592313fc77e056f6424ea4668.tar.xz | |
fix dlsym RTLD_NEXT support
previously this was being handled the same as a library-specific,
dependency-order lookup on the next library in the global chain, which
is likely to be utterly meaningless. instead the lookup needs to be in
the global namespace, but omitting the initial portion of the global
library chain up through the calling library.
| -rw-r--r-- | src/ldso/dynlink.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index 55c2bbe4..263593ab 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -766,7 +766,9 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra) if (p == RTLD_NEXT) { for (p=head; p && (unsigned char *)ra-p->map>p->map_len; p=p->next); if (!p) p=head; - p=p->next; + void *res = find_sym(p->next, s, 0); + if (!res) goto failed; + return res; } if (p == head || p == RTLD_DEFAULT) { void *res = find_sym(head, s, 0); |