generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix protected symbol lookups for mips

Browse Source 
Bug: http://b/20694161
Change-Id: I5cc58034f9776e1db9cddc34abe48ef85f6048f4
(cherry picked from commit dbe26fdcc7)
This commit is contained in:
Dmitriy Ivanov
2015-05-04 19:30:49 -07:00
parent 064a9800f3
commit 456afe24b6
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libc/include/elf.h
View File

@@ -187,6 +187,11 @@ typedef struct {
#define STT_LOPROC 13 #define STT_LOPROC 13
#define STT_HIPROC 15 #define STT_HIPROC 15
#define STV_DEFAULT 0
#define STV_INTERNAL 1
#define STV_HIDDEN 2
#define STV_PROTECTED 3
/* The kernel uses NT_PRFPREG but glibc also offers NT_FPREGSET */ /* The kernel uses NT_PRFPREG but glibc also offers NT_FPREGSET */
#define NT_FPREGSET NT_PRFPREG #define NT_FPREGSET NT_PRFPREG

26
linker/linker_mips.cpp
View File

@@ -157,20 +157,34 @@ bool soinfo::mips_relocate_got(const VersionTracker& version_tracker,
soinfo* lsi = nullptr; soinfo* lsi = nullptr;
const ElfW(Sym)* s = nullptr; const ElfW(Sym)* s = nullptr;
const version_info* vi = nullptr; ElfW(Word) st_visibility = (local_sym->st_other & 0x3);
if (!lookup_version_info(version_tracker, sym, sym_name, &vi)) { if (st_visibility == STV_DEFAULT) {
return false; const version_info* vi = nullptr;
}
if (!soinfo_do_lookup(this, sym_name, vi, &lsi, global_group, local_group, &s)) { if (!lookup_version_info(version_tracker, sym, sym_name, &vi)) {
return false;
}
if (!soinfo_do_lookup(this, sym_name, vi, &lsi, global_group, local_group, &s)) {
return false;
}
} else if (st_visibility == STV_PROTECTED) {
if (local_sym->st_value == 0) {
DL_ERR("%s: invalid symbol \"%s\" (PROTECTED/UNDEFINED) ", get_soname(), sym_name);
return false;
}
s = local_sym;
lsi = this;
} else {
DL_ERR("%s: invalid symbol \"%s\" visibility: 0x%x", get_soname(), sym_name, st_visibility);
return false; return false;
} }
if (s == nullptr) { if (s == nullptr) {
// We only allow an undefined symbol if this is a weak reference. // We only allow an undefined symbol if this is a weak reference.
if (ELF_ST_BIND(local_sym->st_info) != STB_WEAK) { if (ELF_ST_BIND(local_sym->st_info) != STB_WEAK) {
DL_ERR("cannot locate \"%s\"...", sym_name); DL_ERR("%s: cannot locate \"%s\"...", get_soname(), sym_name);
return false; return false;
} }
*got = 0; *got = 0;