diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-23 17:56:28 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-23 17:56:28 +0000 |
| commit | aa725129e840e596bbbf43b80fed6194a0dfbc72 (patch) | |
| tree | 0578b4c71aab8f3d979d3181a922382acf050816 /toolchain/uClibc/patches-0.9.29/150-fix-ldso-text-realloc-segfault.patch | |
| parent | aea8cdc96da2e917d66a3ec59fe3b94f424bc570 (diff) | |
clean up uclibc patch/config version handling a bit
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14994 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/uClibc/patches-0.9.29/150-fix-ldso-text-realloc-segfault.patch')
| -rw-r--r-- | toolchain/uClibc/patches-0.9.29/150-fix-ldso-text-realloc-segfault.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches-0.9.29/150-fix-ldso-text-realloc-segfault.patch b/toolchain/uClibc/patches-0.9.29/150-fix-ldso-text-realloc-segfault.patch new file mode 100644 index 000000000..7006f98b1 --- /dev/null +++ b/toolchain/uClibc/patches-0.9.29/150-fix-ldso-text-realloc-segfault.patch @@ -0,0 +1,29 @@ +--- a/ldso/ldso/ldso.c ++++ b/ldso/ldso/ldso.c +@@ -286,15 +286,20 @@ void _dl_get_ready_to_run(struct elf_res + _dl_debug_early("calling mprotect on the application program\n"); + /* Now cover the application program. */ + if (app_tpnt->dynamic_info[DT_TEXTREL]) { +- ppnt = (ElfW(Phdr) *) auxvt[AT_PHDR].a_un.a_val; +- for (i = 0; i < auxvt[AT_PHNUM].a_un.a_val; i++, ppnt++) { +- if (ppnt->p_type == PT_LOAD && !(ppnt->p_flags & PF_W)) +- _dl_mprotect((void *) (DL_RELOC_ADDR(app_tpnt->loadaddr, ppnt->p_vaddr) & PAGE_ALIGN), +- ((ppnt->p_vaddr + app_tpnt->loadaddr) & ADDR_ALIGN) + +- (unsigned long) ppnt->p_filesz, ++ ElfW(Phdr) *ppnt_inner = (ElfW(Phdr) *) auxvt[AT_PHDR].a_un.a_val; ++ for (i = 0; i < auxvt[AT_PHNUM].a_un.a_val; i++, ppnt_inner++) { ++ if (ppnt_inner->p_type == PT_LOAD && !(ppnt_inner->p_flags & PF_W)) ++ _dl_mprotect((void *) (DL_RELOC_ADDR(app_tpnt->loadaddr, ppnt_inner->p_vaddr) & PAGE_ALIGN), ++ ((ppnt_inner->p_vaddr + app_tpnt->loadaddr) & ADDR_ALIGN) + ++ (unsigned long) ppnt_inner->p_filesz, + PROT_READ | PROT_WRITE | PROT_EXEC); + } + } ++#else ++ if (app_tpnt->dynamic_info[DT_TEXTREL]) { ++ _dl_dprintf(_dl_debug_file, "Can't modify application's text section; use the GCC option -fPIE for position-independent executables.\n"); ++ _dl_exit(1); ++} + #endif + + #ifndef ALLOW_ZERO_PLTGOT |