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

am 9c2122e8: Merge "Fix R_AARCH64_ABS/PREL relocations"

Browse Source 
* commit '9c2122e803a01c80bef550eac2b24b5a79635a2a':
  Fix R_AARCH64_ABS/PREL relocations
This commit is contained in:
Dimitry Ivanov 2015-10-16 13:41:44 -07:00 committed by Android Git Automerger
commit c0e917abe5
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
linker/linker.cpp
View File

@ -2173,24 +2173,23 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r
count_relocation(kRelocAbsolute); count_relocation(kRelocAbsolute);
MARK(rel->r_offset); MARK(rel->r_offset);
TRACE_TYPE(RELO, "RELO ABS64 %16llx <- %16llx %s\n", TRACE_TYPE(RELO, "RELO ABS64 %16llx <- %16llx %s\n",
reloc, (sym_addr + addend), sym_name); reloc, sym_addr + addend, sym_name);
*reinterpret_cast<ElfW(Addr)*>(reloc) += (sym_addr + addend); *reinterpret_cast<ElfW(Addr)*>(reloc) = sym_addr + addend;
break; break;
case R_AARCH64_ABS32: case R_AARCH64_ABS32:
count_relocation(kRelocAbsolute); count_relocation(kRelocAbsolute);
MARK(rel->r_offset); MARK(rel->r_offset);
TRACE_TYPE(RELO, "RELO ABS32 %16llx <- %16llx %s\n", TRACE_TYPE(RELO, "RELO ABS32 %16llx <- %16llx %s\n",
reloc, (sym_addr + addend), sym_name); reloc, sym_addr + addend, sym_name);
{ {
const ElfW(Addr) reloc_value = *reinterpret_cast<ElfW(Addr)*>(reloc);
const ElfW(Addr) min_value = static_cast<ElfW(Addr)>(INT32_MIN); const ElfW(Addr) min_value = static_cast<ElfW(Addr)>(INT32_MIN);
const ElfW(Addr) max_value = static_cast<ElfW(Addr)>(UINT32_MAX); const ElfW(Addr) max_value = static_cast<ElfW(Addr)>(UINT32_MAX);
if ((min_value <= (reloc_value + (sym_addr + addend))) && if ((min_value <= (sym_addr + addend)) &&
((reloc_value + (sym_addr + addend)) <= max_value)) { ((sym_addr + addend) <= max_value)) {
*reinterpret_cast<ElfW(Addr)*>(reloc) += (sym_addr + addend); *reinterpret_cast<ElfW(Addr)*>(reloc) = sym_addr + addend;
} else { } else {
DL_ERR("0x%016llx out of range 0x%016llx to 0x%016llx", DL_ERR("0x%016llx out of range 0x%016llx to 0x%016llx",
(reloc_value + (sym_addr + addend)), min_value, max_value); sym_addr + addend, min_value, max_value);
return false; return false;
} }
} }
@ -2199,17 +2198,16 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r
count_relocation(kRelocAbsolute); count_relocation(kRelocAbsolute);
MARK(rel->r_offset); MARK(rel->r_offset);
TRACE_TYPE(RELO, "RELO ABS16 %16llx <- %16llx %s\n", TRACE_TYPE(RELO, "RELO ABS16 %16llx <- %16llx %s\n",
reloc, (sym_addr + addend), sym_name); reloc, sym_addr + addend, sym_name);
{ {
const ElfW(Addr) reloc_value = *reinterpret_cast<ElfW(Addr)*>(reloc);
const ElfW(Addr) min_value = static_cast<ElfW(Addr)>(INT16_MIN); const ElfW(Addr) min_value = static_cast<ElfW(Addr)>(INT16_MIN);
const ElfW(Addr) max_value = static_cast<ElfW(Addr)>(UINT16_MAX); const ElfW(Addr) max_value = static_cast<ElfW(Addr)>(UINT16_MAX);
if ((min_value <= (reloc_value + (sym_addr + addend))) && if ((min_value <= (sym_addr + addend)) &&
((reloc_value + (sym_addr + addend)) <= max_value)) { ((sym_addr + addend) <= max_value)) {
*reinterpret_cast<ElfW(Addr)*>(reloc) += (sym_addr + addend); *reinterpret_cast<ElfW(Addr)*>(reloc) = (sym_addr + addend);
} else { } else {
DL_ERR("0x%016llx out of range 0x%016llx to 0x%016llx", DL_ERR("0x%016llx out of range 0x%016llx to 0x%016llx",
reloc_value + (sym_addr + addend), min_value, max_value); sym_addr + addend, min_value, max_value);
return false; return false;
} }
} }
@ -2218,24 +2216,23 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r
count_relocation(kRelocRelative); count_relocation(kRelocRelative);
MARK(rel->r_offset); MARK(rel->r_offset);
TRACE_TYPE(RELO, "RELO REL64 %16llx <- %16llx - %16llx %s\n", TRACE_TYPE(RELO, "RELO REL64 %16llx <- %16llx - %16llx %s\n",
reloc, (sym_addr + addend), rel->r_offset, sym_name); reloc, sym_addr + addend, rel->r_offset, sym_name);
*reinterpret_cast<ElfW(Addr)*>(reloc) += (sym_addr + addend) - rel->r_offset; *reinterpret_cast<ElfW(Addr)*>(reloc) = sym_addr + addend - rel->r_offset;
break; break;
case R_AARCH64_PREL32: case R_AARCH64_PREL32:
count_relocation(kRelocRelative); count_relocation(kRelocRelative);
MARK(rel->r_offset); MARK(rel->r_offset);
TRACE_TYPE(RELO, "RELO REL32 %16llx <- %16llx - %16llx %s\n", TRACE_TYPE(RELO, "RELO REL32 %16llx <- %16llx - %16llx %s\n",
reloc, (sym_addr + addend), rel->r_offset, sym_name); reloc, sym_addr + addend, rel->r_offset, sym_name);
{ {
const ElfW(Addr) reloc_value = *reinterpret_cast<ElfW(Addr)*>(reloc);
const ElfW(Addr) min_value = static_cast<ElfW(Addr)>(INT32_MIN); const ElfW(Addr) min_value = static_cast<ElfW(Addr)>(INT32_MIN);
const ElfW(Addr) max_value = static_cast<ElfW(Addr)>(UINT32_MAX); const ElfW(Addr) max_value = static_cast<ElfW(Addr)>(UINT32_MAX);
if ((min_value <= (reloc_value + ((sym_addr + addend) - rel->r_offset))) && if ((min_value <= (sym_addr + addend - rel->r_offset)) &&
((reloc_value + ((sym_addr + addend) - rel->r_offset)) <= max_value)) { ((sym_addr + addend - rel->r_offset) <= max_value)) {
*reinterpret_cast<ElfW(Addr)*>(reloc) += ((sym_addr + addend) - rel->r_offset); *reinterpret_cast<ElfW(Addr)*>(reloc) = sym_addr + addend - rel->r_offset;
} else { } else {
DL_ERR("0x%016llx out of range 0x%016llx to 0x%016llx", DL_ERR("0x%016llx out of range 0x%016llx to 0x%016llx",
reloc_value + ((sym_addr + addend) - rel->r_offset), min_value, max_value); sym_addr + addend - rel->r_offset, min_value, max_value);
return false; return false;
} }
} }
@ -2244,17 +2241,16 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r
count_relocation(kRelocRelative); count_relocation(kRelocRelative);
MARK(rel->r_offset); MARK(rel->r_offset);
TRACE_TYPE(RELO, "RELO REL16 %16llx <- %16llx - %16llx %s\n", TRACE_TYPE(RELO, "RELO REL16 %16llx <- %16llx - %16llx %s\n",
reloc, (sym_addr + addend), rel->r_offset, sym_name); reloc, sym_addr + addend, rel->r_offset, sym_name);
{ {
const ElfW(Addr) reloc_value = *reinterpret_cast<ElfW(Addr)*>(reloc);
const ElfW(Addr) min_value = static_cast<ElfW(Addr)>(INT16_MIN); const ElfW(Addr) min_value = static_cast<ElfW(Addr)>(INT16_MIN);
const ElfW(Addr) max_value = static_cast<ElfW(Addr)>(UINT16_MAX); const ElfW(Addr) max_value = static_cast<ElfW(Addr)>(UINT16_MAX);
if ((min_value <= (reloc_value + ((sym_addr + addend) - rel->r_offset))) && if ((min_value <= (sym_addr + addend - rel->r_offset)) &&
((reloc_value + ((sym_addr + addend) - rel->r_offset)) <= max_value)) { ((sym_addr + addend - rel->r_offset) <= max_value)) {
*reinterpret_cast<ElfW(Addr)*>(reloc) += ((sym_addr + addend) - rel->r_offset); *reinterpret_cast<ElfW(Addr)*>(reloc) = sym_addr + addend - rel->r_offset;
} else { } else {
DL_ERR("0x%016llx out of range 0x%016llx to 0x%016llx", DL_ERR("0x%016llx out of range 0x%016llx to 0x%016llx",
reloc_value + ((sym_addr + addend) - rel->r_offset), min_value, max_value); sym_addr + addend - rel->r_offset, min_value, max_value);
return false; return false;
} }
} }