This is an archive of the discontinued LLVM Phabricator instance.

Differential D8739

[PATCH 13/13] ELF/AARCH64: Add overflow check for R_AARCH64_TLSLE_ADD_TPREL_HI12
AbandonedPublic

Authored by zatrazz on Mar 31 2015, 10:59 AM.

Details

Reviewers
None
Group Reviewers
lld

Diff Detail

Event Timeline

zatrazz updated this revision to Diff 22985.Mar 31 2015, 10:59 AM
zatrazz retitled this revision from to [PATCH 13/13] ELF/AARCH64: Add overflow check for R_AARCH64_TLSLE_ADD_TPREL_HI12.
zatrazz updated this object.
zatrazz edited the test plan for this revision. (Show Details)
zatrazz added a reviewer: lld.
zatrazz added a project: lld.
zatrazz added a subscriber: Unknown Object (MLST).
Herald added subscribers: aemerson, rengolin. · View Herald TranscriptMar 31 2015, 10:59 AM
zatrazz abandoned this revision.Apr 6 2015, 12:47 PM

Revision Contents

PathSize
lib/
ReaderWriter/
ELF/
AArch64/
14 lines

Diff 22985

lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.cpp

Show First 20 Lines • Show All 346 Lines • ▼ Show 20 Lines DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
llvm::dbgs() << " S: " << Twine::utohexstr(S); llvm::dbgs() << " S: " << Twine::utohexstr(S);
llvm::dbgs() << " A: " << Twine::utohexstr(A); llvm::dbgs() << " A: " << Twine::utohexstr(A);
llvm::dbgs() << " P: " << Twine::utohexstr(P); llvm::dbgs() << " P: " << Twine::utohexstr(P);
llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n"); llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
write32le(location, result | read32le(location)); write32le(location, result | read32le(location));
} }
/// \brief R_AARCH64_TLSLE_ADD_TPREL_HI12 /// \brief R_AARCH64_TLSLE_ADD_TPREL_HI12
static void relocR_AARCH64_TLSLE_ADD_TPREL_HI12(uint8_t *location, uint64_t P, static std::error_code relocR_AARCH64_TLSLE_ADD_TPREL_HI12(uint8_t *location,
uint64_t S, int64_t A) { uint64_t P,
uint64_t S,
int64_t A) {
int32_t result = S + A; int32_t result = S + A;
if (!isUInt<24>(result))
return make_out_of_range_reloc_error();
result &= 0x0FFF000; result &= 0x0FFF000;
result >>= 2; result >>= 2;
DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -"; DEBUG(llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
llvm::dbgs() << " S: " << Twine::utohexstr(S); llvm::dbgs() << " S: " << Twine::utohexstr(S);
llvm::dbgs() << " A: " << Twine::utohexstr(A); llvm::dbgs() << " A: " << Twine::utohexstr(A);
llvm::dbgs() << " P: " << Twine::utohexstr(P); llvm::dbgs() << " P: " << Twine::utohexstr(P);
llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n"); llvm::dbgs() << " result: " << Twine::utohexstr(result) << "\n");
write32le(location, result | read32le(location)); write32le(location, result | read32le(location));
return std::error_code();
} }
/// \brief R_AARCH64_TLSLE_ADD_TPREL_LO12_NC /// \brief R_AARCH64_TLSLE_ADD_TPREL_LO12_NC
static void relocR_AARCH64_TLSLE_ADD_TPREL_LO12_NC(uint8_t *location, static void relocR_AARCH64_TLSLE_ADD_TPREL_LO12_NC(uint8_t *location,
uint64_t P, uint64_t S, uint64_t P, uint64_t S,
int64_t A) { int64_t A) {
int32_t result = S + A; int32_t result = S + A;
result &= 0x0FFF; result &= 0x0FFF;
▲ Show 20 Lines • Show All 94 Lines • ▼ Show 20 Linesstd::error_code AArch64TargetRelocationHandler::applyRelocation(
case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21: case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
return relocR_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21(location, relocVAddress, return relocR_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21(location, relocVAddress,
targetVAddress, ref.addend()); targetVAddress, ref.addend());
case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC: case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
relocR_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC(location, relocVAddress, relocR_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC(location, relocVAddress,
targetVAddress, ref.addend()); targetVAddress, ref.addend());
break; break;
case R_AARCH64_TLSLE_ADD_TPREL_HI12: case R_AARCH64_TLSLE_ADD_TPREL_HI12:
relocR_AARCH64_TLSLE_ADD_TPREL_HI12(location, relocVAddress, targetVAddress, return relocR_AARCH64_TLSLE_ADD_TPREL_HI12(location, relocVAddress,
ref.addend()); targetVAddress, ref.addend());
break;
case R_AARCH64_TLSLE_ADD_TPREL_LO12_NC: case R_AARCH64_TLSLE_ADD_TPREL_LO12_NC:
relocR_AARCH64_TLSLE_ADD_TPREL_LO12_NC(location, relocVAddress, relocR_AARCH64_TLSLE_ADD_TPREL_LO12_NC(location, relocVAddress,
targetVAddress, ref.addend()); targetVAddress, ref.addend());
break; break;
default: default:
return make_unhandled_reloc_error(); return make_unhandled_reloc_error();
} }
return std::error_code(); return std::error_code();
} }