diff options
| author | Roland McGrath <roland@gnu.org> | 2005-02-16 09:47:36 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-02-16 09:47:36 +0000 |
| commit | 36ffaa53b4d217f6611ebeb303b443bfca2ca72f (patch) | |
| tree | 15a5f4edb00155093bd446a9415e2d9ca36276e0 /elf | |
| parent | ba72b5487d2280b4a8425535c7dee162f6013789 (diff) | |
2005-01-05 Steven Munroe <sjmunroe@us.ibm.com>
[BZ #729]
* elf/rtld.c (dl_main) [NEED_DL_SYSINFO_DSO]: Insure l_map_end and
l_text_end are set for a VDSO with a single PT_LOAD entry.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/rtld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index cd40f80088..854b96b3b8 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1304,9 +1304,9 @@ ERROR: ld.so: object '%s' from %s cannot be preloaded: ignored.\n", { if (! l->l_addr) l->l_addr = ph->p_vaddr; - else if (ph->p_vaddr + ph->p_memsz >= l->l_map_end) + if (ph->p_vaddr + ph->p_memsz >= l->l_map_end) l->l_map_end = ph->p_vaddr + ph->p_memsz; - else if ((ph->p_flags & PF_X) + if ((ph->p_flags & PF_X) && ph->p_vaddr + ph->p_memsz >= l->l_text_end) l->l_text_end = ph->p_vaddr + ph->p_memsz; } |