[git commit nptl] ldso/i386: support protected symbols
Joakim Tjernlund
joakim.tjernlund at transmode.se
Fri Apr 16 17:12:36 UTC 2010
commit: http://git.uclibc.org/uClibc/commit/?id=ba38f0cec27b91cc7c605417ad047c4dc77d732f
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl
Make sure protected symbols are not overridden by other modules.
Signed-off-by: Joakim Tjernlund <joakim.tjernlund at transmode.se>
Signed-off-by: Timo Teräs <timo.teras at iki.fi>
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
ldso/ldso/i386/elfinterp.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ldso/ldso/i386/elfinterp.c b/ldso/ldso/i386/elfinterp.c
index a01c1d0..1e3a2b2 100644
--- a/ldso/ldso/i386/elfinterp.c
+++ b/ldso/ldso/i386/elfinterp.c
@@ -175,7 +175,9 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
symbol_addr = 0;
symname = strtab + symtab[symtab_index].st_name;
- if (symtab_index) {
+ if (symtab_index &&
+ (ELF32_ST_VISIBILITY(symtab[symtab_index].st_other)
+ != STV_PROTECTED)) {
symbol_addr = (unsigned long)_dl_find_hash(symname, scope, tpnt,
elf_machine_type_class(reloc_type), &tls_tpnt);
@@ -188,7 +190,11 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
&& ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK))
return 1;
} else {
- symbol_addr = symtab[symtab_index].st_value;
+ if (symtab_index)
+ symbol_addr = DL_FIND_HASH_VALUE(tpnt, elf_machine_type_class(reloc_type),
+ &symtab[symtab_index]);
+ else
+ symbol_addr = symtab[symtab_index].st_value;
tls_tpnt = tpnt;
}
--
1.6.3.3
More information about the uClibc-cvs
mailing list