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

am 15989a2b: am e2997950: Merge "Cleanup: remove AARCH/ARM_COPY relocation support"

Browse Source 
* commit '15989a2b343fa55ff9e6aa927e7ce2fbe76a86cf':
  Cleanup: remove AARCH/ARM_COPY relocation support
This commit is contained in:
Dmitriy Ivanov 2014-05-12 17:33:14 +00:00 committed by Android Git Automerger
commit 1a6b54fd2e
1 changed files with 27 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
linker/linker.cpp
View File

@ -59,7 +59,6 @@
* *
* open issues / todo: * open issues / todo:
* *
* - are we doing everything we should for ARM_COPY relocations?
* - cleaner error reporting * - cleaner error reporting
* - after linking, set as much stuff as possible to READONLY * - after linking, set as much stuff as possible to READONLY
* and NOEXEC * and NOEXEC
@ -1024,8 +1023,9 @@ static int soinfo_relocate(soinfo* si, ElfW(Rela)* rela, unsigned count, soinfo*
break; break;
case R_AARCH64_COPY: case R_AARCH64_COPY:
if ((si->flags & FLAG_EXE) == 0) {
/* /*
* ET_EXEC is not supported so this should not happen.
*
* http://infocenter.arm.com/help/topic/com.arm.doc.ihi0044d/IHI0044D_aaelf.pdf * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0044d/IHI0044D_aaelf.pdf
* *
* Section 4.7.1.10 "Dynamic relocations" * Section 4.7.1.10 "Dynamic relocations"
@ -1036,40 +1036,8 @@ static int soinfo_relocate(soinfo* si, ElfW(Rela)* rela, unsigned count, soinfo*
* We should explicitly disallow ET_DYN executables from having * We should explicitly disallow ET_DYN executables from having
* R_AARCH64_COPY relocations. * R_AARCH64_COPY relocations.
*/ */
DL_ERR("%s R_AARCH64_COPY relocations only supported for ET_EXEC", si->name); DL_ERR("%s R_AARCH64_COPY relocations are not supported", si->name);
return -1; return -1;
}
count_relocation(kRelocCopy);
MARK(rela->r_offset);
TRACE_TYPE(RELO, "RELO COPY %16llx <- %lld @ %16llx %s\n",
reloc,
s->st_size,
(sym_addr + rela->r_addend),
sym_name);
if (reloc == (sym_addr + rela->r_addend)) {
ElfW(Sym)* src = soinfo_do_lookup(NULL, sym_name, &lsi, needed);
if (src == NULL) {
DL_ERR("%s R_AARCH64_COPY relocation source cannot be resolved", si->name);
return -1;
}
if (lsi->has_DT_SYMBOLIC) {
DL_ERR("%s invalid R_AARCH64_COPY relocation against DT_SYMBOLIC shared "
"library %s (built with -Bsymbolic?)", si->name, lsi->name);
return -1;
}
if (s->st_size < src->st_size) {
DL_ERR("%s R_AARCH64_COPY relocation size mismatch (%lld < %lld)",
si->name, s->st_size, src->st_size);
return -1;
}
memcpy(reinterpret_cast<void*>(reloc),
reinterpret_cast<void*>(src->st_value + lsi->load_bias), src->st_size);
} else {
DL_ERR("%s R_AARCH64_COPY relocation target cannot be resolved", si->name);
return -1;
}
break;
case R_AARCH64_TLS_TPREL64: case R_AARCH64_TLS_TPREL64:
TRACE_TYPE(RELO, "RELO TLS_TPREL64 *** %16llx <- %16llx - %16llx\n", TRACE_TYPE(RELO, "RELO TLS_TPREL64 *** %16llx <- %16llx - %16llx\n",
reloc, (sym_addr + rela->r_addend), rela->r_offset); reloc, (sym_addr + rela->r_addend), rela->r_offset);
@ -1247,7 +1215,6 @@ static int soinfo_relocate(soinfo* si, ElfW(Rel)* rel, unsigned count, soinfo* n
*reinterpret_cast<ElfW(Addr)*>(reloc) += sym_addr - rel->r_offset; *reinterpret_cast<ElfW(Addr)*>(reloc) += sym_addr - rel->r_offset;
break; break;
case R_ARM_COPY: case R_ARM_COPY:
if ((si->flags & FLAG_EXE) == 0) {
/* /*
* http://infocenter.arm.com/help/topic/com.arm.doc.ihi0044d/IHI0044D_aaelf.pdf * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0044d/IHI0044D_aaelf.pdf
* *
@ -1255,40 +1222,11 @@ static int soinfo_relocate(soinfo* si, ElfW(Rel)* rel, unsigned count, soinfo* n
* R_ARM_COPY may only appear in executable objects where e_type is * R_ARM_COPY may only appear in executable objects where e_type is
* set to ET_EXEC. * set to ET_EXEC.
* *
* TODO: FLAG_EXE is set for both ET_DYN and ET_EXEC executables. * We explicitly disallow ET_DYN executables from having
* We should explicitly disallow ET_DYN executables from having
* R_ARM_COPY relocations. * R_ARM_COPY relocations.
*/ */
DL_ERR("%s R_ARM_COPY relocations only supported for ET_EXEC", si->name); DL_ERR("%s R_ARM_COPY relocations are not supported", si->name);
return -1; return -1;
}
count_relocation(kRelocCopy);
MARK(rel->r_offset);
TRACE_TYPE(RELO, "RELO %08x <- %d @ %08x %s", reloc, s->st_size, sym_addr, sym_name);
if (reloc == sym_addr) {
ElfW(Sym)* src = soinfo_do_lookup(NULL, sym_name, &lsi, needed);
if (src == NULL) {
DL_ERR("%s R_ARM_COPY relocation source cannot be resolved", si->name);
return -1;
}
if (lsi->has_DT_SYMBOLIC) {
DL_ERR("%s invalid R_ARM_COPY relocation against DT_SYMBOLIC shared "
"library %s (built with -Bsymbolic?)", si->name, lsi->name);
return -1;
}
if (s->st_size < src->st_size) {
DL_ERR("%s R_ARM_COPY relocation size mismatch (%d < %d)",
si->name, s->st_size, src->st_size);
return -1;
}
memcpy(reinterpret_cast<void*>(reloc),
reinterpret_cast<void*>(src->st_value + lsi->load_bias), src->st_size);
} else {
DL_ERR("%s R_ARM_COPY relocation target cannot be resolved", si->name);
return -1;
}
break;
#elif defined(__i386__) #elif defined(__i386__)
case R_386_JMP_SLOT: case R_386_JMP_SLOT:
count_relocation(kRelocAbsolute); count_relocation(kRelocAbsolute);