From 05d358bad521a48dfb4ede018a43d0dda3fa8186 Mon Sep 17 00:00:00 2001 From: Paul Semel Date: Wed, 25 Jul 2018 11:09:20 +0000 Subject: [PATCH] [llvm-objdump] Add dynamic section printing to private-headers option Differential Revision: https://reviews.llvm.org/D49016 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@337902 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Object/ELF.h | 7 + lib/Object/ELF.cpp | 138 ++++++++++++++++++ .../Inputs/private-headers-x86_64.elf | Bin 0 -> 8968 bytes .../private-headers-dynamic-section.test | 35 +++++ .../private-headers-no-dynamic-segment.test | 42 ++++++ .../private-headers-no-dynamic.test | 19 +++ tools/llvm-objdump/ELFDump.cpp | 89 +++++++++++ tools/llvm-objdump/llvm-objdump.cpp | 6 +- tools/llvm-objdump/llvm-objdump.h | 1 + 9 files changed, 335 insertions(+), 2 deletions(-) create mode 100755 test/tools/llvm-objdump/Inputs/private-headers-x86_64.elf create mode 100644 test/tools/llvm-objdump/private-headers-dynamic-section.test create mode 100644 test/tools/llvm-objdump/private-headers-no-dynamic-segment.test create mode 100644 test/tools/llvm-objdump/private-headers-no-dynamic.test diff --git a/include/llvm/Object/ELF.h b/include/llvm/Object/ELF.h index 1700dbed21b..752d468fd25 100644 --- a/include/llvm/Object/ELF.h +++ b/include/llvm/Object/ELF.h @@ -115,6 +115,9 @@ public: SmallVectorImpl &Result) const; uint32_t getRelrRelocationType() const; + const char *getDynamicTagAsString(unsigned Arch, uint64_t Type) const; + const char *getDynamicTagAsString(uint64_t Type) const; + /// Get the symbol for a given relocation. Expected getRelocationSymbol(const Elf_Rel *Rel, const Elf_Shdr *SymTab) const; @@ -133,6 +136,10 @@ public: Expected sections() const; + Expected dynamicEntries() const; + + Expected toMappedAddr(uint64_t VAddr) const; + Expected symbols(const Elf_Shdr *Sec) const { if (!Sec) return makeArrayRef(nullptr, nullptr); diff --git a/lib/Object/ELF.cpp b/lib/Object/ELF.cpp index 3e2161a9396..2eefb7ef13a 100644 --- a/lib/Object/ELF.cpp +++ b/lib/Object/ELF.cpp @@ -420,6 +420,144 @@ ELFFile::android_relas(const Elf_Shdr *Sec) const { return Relocs; } +template +const char *ELFFile::getDynamicTagAsString(unsigned Arch, + uint64_t Type) const { +#define DYNAMIC_STRINGIFY_ENUM(tag, value) \ + case value: \ + return #tag; + +#define DYNAMIC_TAG(n, v) + switch (Arch) { + case ELF::EM_HEXAGON: + switch (Type) { +#define HEXAGON_DYNAMIC_TAG(name, value) DYNAMIC_STRINGIFY_ENUM(name, value) +#include "llvm/BinaryFormat/DynamicTags.def" +#undef HEXAGON_DYNAMIC_TAG + } + + case ELF::EM_MIPS: + switch (Type) { +#define MIPS_DYNAMIC_TAG(name, value) DYNAMIC_STRINGIFY_ENUM(name, value) +#include "llvm/BinaryFormat/DynamicTags.def" +#undef MIPS_DYNAMIC_TAG + } + + case ELF::EM_PPC64: + switch (Type) { +#define PPC64_DYNAMIC_TAG(name, value) DYNAMIC_STRINGIFY_ENUM(name, value) +#include "llvm/BinaryFormat/DynamicTags.def" +#undef PPC64_DYNAMIC_TAG + } + } +#undef DYNAMIC_TAG + switch (Type) { +// Now handle all dynamic tags except the architecture specific ones +#define MIPS_DYNAMIC_TAG(name, value) +#define HEXAGON_DYNAMIC_TAG(name, value) +#define PPC64_DYNAMIC_TAG(name, value) +// Also ignore marker tags such as DT_HIOS (maps to DT_VERNEEDNUM), etc. +#define DYNAMIC_TAG_MARKER(name, value) +#define DYNAMIC_TAG(name, value) DYNAMIC_STRINGIFY_ENUM(name, value) +#include "llvm/BinaryFormat/DynamicTags.def" +#undef DYNAMIC_TAG +#undef MIPS_DYNAMIC_TAG +#undef HEXAGON_DYNAMIC_TAG +#undef PPC64_DYNAMIC_TAG +#undef DYNAMIC_TAG_MARKER +#undef DYNAMIC_STRINGIFY_ENUM + default: + return "unknown"; + } +} + +template +const char *ELFFile::getDynamicTagAsString(uint64_t Type) const { + return getDynamicTagAsString(getHeader()->e_machine, Type); +} + +template +Expected ELFFile::dynamicEntries() const { + ArrayRef Dyn; + size_t DynSecSize = 0; + + auto ProgramHeadersOrError = program_headers(); + if (!ProgramHeadersOrError) + return ProgramHeadersOrError.takeError(); + + for (const Elf_Phdr &Phdr : *ProgramHeadersOrError) { + if (Phdr.p_type == ELF::PT_DYNAMIC) { + Dyn = makeArrayRef( + reinterpret_cast(base() + Phdr.p_offset), + Phdr.p_filesz / sizeof(Elf_Dyn)); + DynSecSize = Phdr.p_filesz; + break; + } + } + + // If we can't find the dynamic section in the program headers, we just fall + // back on the sections. + if (Dyn.empty()) { + auto SectionsOrError = sections(); + if (!SectionsOrError) + return SectionsOrError.takeError(); + + for (const Elf_Shdr &Sec : *SectionsOrError) { + if (Sec.sh_type == ELF::SHT_DYNAMIC) { + Expected> DynOrError = + getSectionContentsAsArray(&Sec); + if (!DynOrError) + return DynOrError.takeError(); + Dyn = *DynOrError; + DynSecSize = Sec.sh_size; + break; + } + } + + if (!Dyn.data()) + return ArrayRef(); + } + + if (Dyn.empty()) + return createError("invalid empty dynamic section"); + + if (DynSecSize % sizeof(Elf_Dyn) != 0) + return createError("malformed dynamic section"); + + if (Dyn.back().d_tag != ELF::DT_NULL) + return createError("dynamic sections must be DT_NULL terminated"); + + return Dyn; +} + +template +Expected ELFFile::toMappedAddr(uint64_t VAddr) const { + auto ProgramHeadersOrError = program_headers(); + if (!ProgramHeadersOrError) + return ProgramHeadersOrError.takeError(); + + llvm::SmallVector LoadSegments; + + for (const Elf_Phdr &Phdr : *ProgramHeadersOrError) + if (Phdr.p_type == ELF::PT_LOAD) + LoadSegments.push_back(const_cast(&Phdr)); + + const Elf_Phdr *const *I = + std::upper_bound(LoadSegments.begin(), LoadSegments.end(), VAddr, + [](uint64_t VAddr, const Elf_Phdr_Impl *Phdr) { + return VAddr < Phdr->p_vaddr; + }); + + if (I == LoadSegments.begin()) + return createError("Virtual address is not in any segment"); + --I; + const Elf_Phdr &Phdr = **I; + uint64_t Delta = VAddr - Phdr.p_vaddr; + if (Delta >= Phdr.p_filesz) + return createError("Virtual address is not in any segment"); + return base() + Phdr.p_offset + Delta; +} + template class llvm::object::ELFFile; template class llvm::object::ELFFile; template class llvm::object::ELFFile; diff --git a/test/tools/llvm-objdump/Inputs/private-headers-x86_64.elf b/test/tools/llvm-objdump/Inputs/private-headers-x86_64.elf new file mode 100755 index 0000000000000000000000000000000000000000..d92d9f1372004efd614ca2eb4d85132dbd950dbd GIT binary patch literal 8968 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 literal 0 HcmV?d00001 diff --git a/test/tools/llvm-objdump/private-headers-dynamic-section.test b/test/tools/llvm-objdump/private-headers-dynamic-section.test new file mode 100644 index 00000000000..ba93d0ba9af --- /dev/null +++ b/test/tools/llvm-objdump/private-headers-dynamic-section.test @@ -0,0 +1,35 @@ +# RUN: llvm-objdump -p %p/Inputs/private-headers-x86_64.elf | FileCheck %s +# RUN: llvm-objcopy --strip-sections %p/Inputs/private-headers-x86_64.elf %t +# RUN: llvm-objdump -p %t | FileCheck %s + +# CHECK: NEEDED libstdc++.so.6 +# CHECK: NEEDED libm.so.6 +# CHECK: NEEDED libgcc_s.so.1 +# CHECK: NEEDED libc.so.6 +# CHECK: INIT 0x00000000000006a0 +# CHECK: FINI 0x0000000000000924 +# CHECK: INIT_ARRAY 0x0000000000200da8 +# CHECK: INIT_ARRAYSZ 0x0000000000000010 +# CHECK: FINI_ARRAY 0x0000000000200db8 +# CHECK: FINI_ARRAYSZ 0x0000000000000008 +# CHECK: GNU_HASH 0x0000000000000298 +# CHECK: STRTAB 0x00000000000003c8 +# CHECK: SYMTAB 0x00000000000002c0 +# CHECK: STRSZ 0x000000000000012f +# CHECK: SYMENT 0x0000000000000018 +# CHECK: DEBUG 0x0000000000000000 +# CHECK: PLTGOT 0x0000000000201000 +# CHECK: PLTRELSZ 0x0000000000000048 +# CHECK: PLTREL 0x0000000000000007 +# CHECK: JMPREL 0x0000000000000658 +# CHECK: RELA 0x0000000000000550 +# CHECK: RELASZ 0x0000000000000108 +# CHECK: RELAENT 0x0000000000000018 +# CHECK: FLAGS_1 0x0000000008000000 +# CHECK: VERNEED 0x0000000000000510 +# CHECK: VERNEEDNUM 0x0000000000000002 +# CHECK: VERSYM 0x00000000000004f8 +# CHECK: RELACOUNT 0x0000000000000004 +# CHECK: RELRSZ 0x0000000000000014 +# CHECK: RELR 0x0000000087654321 +# CHECK: RELRENT 0x0000000000000010 diff --git a/test/tools/llvm-objdump/private-headers-no-dynamic-segment.test b/test/tools/llvm-objdump/private-headers-no-dynamic-segment.test new file mode 100644 index 00000000000..0aec1fedfec --- /dev/null +++ b/test/tools/llvm-objdump/private-headers-no-dynamic-segment.test @@ -0,0 +1,42 @@ +# RUN: yaml2obj %s > %t +# RUN: llvm-objdump -p %t | FileCheck %s + +!ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + Machine: EM_X86_64 +Sections: + - Name: .dynamic + Type: SHT_DYNAMIC + Flags: [ SHF_ALLOC, SHF_WRITE ] + Content: 0c00000000000000a0060000000000000d0000000000000024090000000000001900000000000000a80d2000000000001b0000000000000010000000000000001a00000000000000b80d2000000000001c000000000000000800000000000000f5feff6f0000000098020000000000000500000000000000c8030000000000000600000000000000c0020000000000000a000000000000002f010000000000000b0000000000000018000000000000001500000000000000000000000000000003000000000000000010200000000000020000000000000048000000000000001400000000000000070000000000000017000000000000005806000000000000070000000000000050050000000000000800000000000000080100000000000009000000000000001800000000000000fbffff6f000000000000000800000000feffff6f000000001005000000000000ffffff6f000000000200000000000000f0ffff6f00000000f804000000000000f9ffff6f0000000004000000000000002300000000000000140000000000000024000000000000002143658700000000250000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000 + +# CHECK: INIT 0x00000000000006a0 +# CHECK: FINI 0x0000000000000924 +# CHECK: INIT_ARRAY 0x0000000000200da8 +# CHECK: INIT_ARRAYSZ 0x0000000000000010 +# CHECK: FINI_ARRAY 0x0000000000200db8 +# CHECK: FINI_ARRAYSZ 0x0000000000000008 +# CHECK: GNU_HASH 0x0000000000000298 +# CHECK: STRTAB 0x00000000000003c8 +# CHECK: SYMTAB 0x00000000000002c0 +# CHECK: STRSZ 0x000000000000012f +# CHECK: SYMENT 0x0000000000000018 +# CHECK: DEBUG 0x0000000000000000 +# CHECK: PLTGOT 0x0000000000201000 +# CHECK: PLTRELSZ 0x0000000000000048 +# CHECK: PLTREL 0x0000000000000007 +# CHECK: JMPREL 0x0000000000000658 +# CHECK: RELA 0x0000000000000550 +# CHECK: RELASZ 0x0000000000000108 +# CHECK: RELAENT 0x0000000000000018 +# CHECK: FLAGS_1 0x0000000008000000 +# CHECK: VERNEED 0x0000000000000510 +# CHECK: VERNEEDNUM 0x0000000000000002 +# CHECK: VERSYM 0x00000000000004f8 +# CHECK: RELACOUNT 0x0000000000000004 +# CHECK: RELRSZ 0x0000000000000014 +# CHECK: RELR 0x0000000087654321 +# CHECK: RELRENT 0x0000000000000010 diff --git a/test/tools/llvm-objdump/private-headers-no-dynamic.test b/test/tools/llvm-objdump/private-headers-no-dynamic.test new file mode 100644 index 00000000000..80c68418338 --- /dev/null +++ b/test/tools/llvm-objdump/private-headers-no-dynamic.test @@ -0,0 +1,19 @@ +# RUN: yaml2obj %s > %t +# RUN: llvm-objdump -p %t | FileCheck %s + +!ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + Machine: EM_X86_64 +Sections: + - Name: .text + Type: SHT_PROGBITS + Flags: [ SHF_ALLOC, SHF_EXECINSTR ] + Address: 0x1000 + AddressAlign: 0x0000000000000010 + Size: 64 + +# CHECK: Dynamic Section: +# CHECK-NOT: {{.}} diff --git a/tools/llvm-objdump/ELFDump.cpp b/tools/llvm-objdump/ELFDump.cpp index 9475ab35f11..f4d36656a6c 100644 --- a/tools/llvm-objdump/ELFDump.cpp +++ b/tools/llvm-objdump/ELFDump.cpp @@ -21,6 +21,77 @@ using namespace llvm; using namespace llvm::object; +template +Expected getDynamicStrTab(const ELFFile *Elf) { + typedef ELFFile ELFO; + + auto DynamicEntriesOrError = Elf->dynamicEntries(); + if (!DynamicEntriesOrError) + return DynamicEntriesOrError.takeError(); + + for (const typename ELFO::Elf_Dyn &Dyn : *DynamicEntriesOrError) { + if (Dyn.d_tag == ELF::DT_STRTAB) { + auto MappedAddrOrError = Elf->toMappedAddr(Dyn.getPtr()); + if (!MappedAddrOrError) + consumeError(MappedAddrOrError.takeError()); + return StringRef(reinterpret_cast(*MappedAddrOrError)); + } + } + + // If the dynamic segment is not present, we fall back on the sections. + auto SectionsOrError = Elf->sections(); + if (!SectionsOrError) + return SectionsOrError.takeError(); + + for (const typename ELFO::Elf_Shdr &Sec : *SectionsOrError) { + if (Sec.sh_type == ELF::SHT_DYNSYM) + return Elf->getStringTableForSymtab(Sec); + } + + return createError("dynamic string table not found"); +} + +template +void printDynamicSection(const ELFFile *Elf, StringRef Filename) { + auto ProgramHeaderOrError = Elf->program_headers(); + if (!ProgramHeaderOrError) + report_error(Filename, ProgramHeaderOrError.takeError()); + + auto DynamicEntriesOrError = Elf->dynamicEntries(); + if (!DynamicEntriesOrError) + report_error(Filename, DynamicEntriesOrError.takeError()); + + outs() << "Dynamic Section:\n"; + for (const auto &Dyn : *DynamicEntriesOrError) { + if (Dyn.d_tag == ELF::DT_NULL) + continue; + + StringRef Str = StringRef(Elf->getDynamicTagAsString(Dyn.d_tag)); + + if (Str.empty()) { + std::string HexStr = utohexstr(static_cast(Dyn.d_tag), true); + outs() << format(" 0x%-19s", HexStr.c_str()); + } else { + // We use "-21" in order to match GNU objdump's output. + outs() << format(" %-21s", Str.data()); + } + + const char *Fmt = + ELFT::Is64Bits ? "0x%016" PRIx64 "\n" : "0x%08" PRIx64 "\n"; + if (Dyn.d_tag == ELF::DT_NEEDED) { + Expected StrTabOrErr = getDynamicStrTab(Elf); + if (StrTabOrErr) { + const char *Data = StrTabOrErr.get().data(); + outs() << (Data + Dyn.d_un.d_val) << "\n"; + continue; + } + warn(errorToErrorCode(StrTabOrErr.takeError()).message()); + consumeError(StrTabOrErr.takeError()); + } + outs() << format(Fmt, (uint64_t)Dyn.d_un.d_val); + } +} + template void printProgramHeaders(const ELFFile *o) { typedef ELFFile ELFO; outs() << "Program Header:\n"; @@ -103,3 +174,21 @@ void llvm::printELFFileHeader(const object::ObjectFile *Obj) { if (const ELF64BEObjectFile *ELFObj = dyn_cast(Obj)) printProgramHeaders(ELFObj->getELFFile()); } + +void llvm::printELFDynamicSection(const object::ObjectFile *Obj) { + // Little-endian 32-bit + if (const ELF32LEObjectFile *ELFObj = dyn_cast(Obj)) + printDynamicSection(ELFObj->getELFFile(), Obj->getFileName()); + + // Big-endian 32-bit + if (const ELF32BEObjectFile *ELFObj = dyn_cast(Obj)) + printDynamicSection(ELFObj->getELFFile(), Obj->getFileName()); + + // Little-endian 64-bit + if (const ELF64LEObjectFile *ELFObj = dyn_cast(Obj)) + printDynamicSection(ELFObj->getELFFile(), Obj->getFileName()); + + // Big-endian 64-bit + if (const ELF64BEObjectFile *ELFObj = dyn_cast(Obj)) + printDynamicSection(ELFObj->getELFFile(), Obj->getFileName()); +} diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index bbac90e74ed..610cd11365c 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -2153,8 +2153,10 @@ static void printFaultMaps(const ObjectFile *Obj) { } static void printPrivateFileHeaders(const ObjectFile *o, bool onlyFirst) { - if (o->isELF()) - return printELFFileHeader(o); + if (o->isELF()) { + printELFFileHeader(o); + return printELFDynamicSection(o); + } if (o->isCOFF()) return printCOFFFileHeader(o); if (o->isWasm()) diff --git a/tools/llvm-objdump/llvm-objdump.h b/tools/llvm-objdump/llvm-objdump.h index c5a1ac8df9e..b2eb6e9d777 100644 --- a/tools/llvm-objdump/llvm-objdump.h +++ b/tools/llvm-objdump/llvm-objdump.h @@ -79,6 +79,7 @@ void printMachOBindTable(object::MachOObjectFile* o); void printMachOLazyBindTable(object::MachOObjectFile* o); void printMachOWeakBindTable(object::MachOObjectFile* o); void printELFFileHeader(const object::ObjectFile *o); +void printELFDynamicSection(const object::ObjectFile *Obj); void printCOFFFileHeader(const object::ObjectFile *o); void printCOFFSymbolTable(const object::COFFImportFile *i); void printCOFFSymbolTable(const object::COFFObjectFile *o); -- 2.50.1