aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-11-11 16:10:50 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-11-11 16:10:50 +0000
commit76553002d999d7d64a110002c44bb31361022080 (patch)
tree6b469049766835f714727a0008fee65205f52b25
parent79289bdca535da058965f4e5b665a9ef63650046 (diff)
downloadupstream-76553002d999d7d64a110002c44bb31361022080.tar.gz
upstream-76553002d999d7d64a110002c44bb31361022080.tar.bz2
upstream-76553002d999d7d64a110002c44bb31361022080.zip
uClibc: backport a fix for dlsym(RTLD_NEXT, ...) use
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 34142
-rw-r--r--toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch b/toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch
new file mode 100644
index 0000000000..5c90ca590b
--- /dev/null
+++ b/toolchain/uClibc/patches-0.9.33.2/011-dlsym_rtld_next_fix.patch
@@ -0,0 +1,26 @@
+diff -urN uClibc-0.9.33.2/ldso/libdl/libdl.c uClibc-0.9.33.2.new/ldso/libdl/libdl.c
+--- uClibc-0.9.33.2/ldso/libdl/libdl.c 2012-05-15 09:20:09.000000000 +0200
++++ uClibc-0.9.33.2.new/ldso/libdl/libdl.c 2012-11-10 18:34:56.673501060 +0100
+@@ -671,7 +671,7 @@
+ {
+ struct elf_resolve *tpnt, *tfrom;
+ struct dyn_elf *handle;
+- ElfW(Addr) from;
++ ElfW(Addr) from = 0;
+ struct dyn_elf *rpnt;
+ void *ret;
+ struct symbol_ref sym_ref = { NULL, NULL };
+@@ -729,7 +729,12 @@
+ tpnt = NULL;
+ if (handle == _dl_symbol_tables)
+ tpnt = handle->dyn; /* Only search RTLD_GLOBAL objs if global object */
+- ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
++ do {
++ ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
++ if (ret != NULL)
++ break;
++ handle = handle->next;
++ } while (from && handle);
+
+ #if defined(USE_TLS) && USE_TLS && defined SHARED
+ if (sym_ref.sym && (ELF_ST_TYPE(sym_ref.sym->st_info) == STT_TLS) && (sym_ref.tpnt)) {