6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-04 02:24:29 +00:00
Code Issues Projects Releases Wiki Activity

Simplify iterating over the dynamic section and report broken ones.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242712 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2015-07-20 21:23:29 +00:00
parent 703ff349ac
commit d94e17bde9
4 changed files with 30 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
include/llvm/Object/ELF.h
View File

@ -140,8 +140,7 @@ public:
typedef Elf_Vernaux_Impl<ELFT> Elf_Vernaux; typedef Elf_Vernaux_Impl<ELFT> Elf_Vernaux;
typedef Elf_Versym_Impl<ELFT> Elf_Versym; typedef Elf_Versym_Impl<ELFT> Elf_Versym;
typedef Elf_Hash_Impl<ELFT> Elf_Hash; typedef Elf_Hash_Impl<ELFT> Elf_Hash;
typedef ELFEntityIterator<const Elf_Dyn> Elf_Dyn_Iter; typedef iterator_range<const Elf_Dyn *> Elf_Dyn_Range;
typedef iterator_range<Elf_Dyn_Iter> Elf_Dyn_Range;
typedef iterator_range<const Elf_Shdr *> Elf_Shdr_Range; typedef iterator_range<const Elf_Shdr *> Elf_Shdr_Range;
/// \brief Archive files are 2 byte aligned, so we need this for /// \brief Archive files are 2 byte aligned, so we need this for
@ -282,10 +281,10 @@ public:
return make_range(symbol_begin(), symbol_end()); return make_range(symbol_begin(), symbol_end());
} }
Elf_Dyn_Iter dynamic_table_begin() const; const Elf_Dyn *dynamic_table_begin() const;
/// \param NULLEnd use one past the first DT_NULL entry as the end instead of /// \param NULLEnd use one past the first DT_NULL entry as the end instead of
/// the section size. /// the section size.
Elf_Dyn_Iter dynamic_table_end(bool NULLEnd = false) const; const Elf_Dyn *dynamic_table_end(bool NULLEnd = false) const;
Elf_Dyn_Range dynamic_table(bool NULLEnd = false) const { Elf_Dyn_Range dynamic_table(bool NULLEnd = false) const {
return make_range(dynamic_table_begin(), dynamic_table_end(NULLEnd)); return make_range(dynamic_table_begin(), dynamic_table_end(NULLEnd));
} }
@ -668,16 +667,6 @@ ELFFile<ELFT>::ELFFile(StringRef Object, std::error_code &EC)
DotDynSymSec = &Sec; DotDynSymSec = &Sec;
break; break;
} }
case ELF::SHT_DYNAMIC:
if (DynamicRegion.Addr) {
// More than one .dynamic!
EC = object_error::parse_failed;
return;
}
DynamicRegion.Addr = base() + Sec.sh_offset;
DynamicRegion.Size = Sec.sh_size;
DynamicRegion.EntSize = Sec.sh_entsize;
break;
case ELF::SHT_GNU_versym: case ELF::SHT_GNU_versym:
if (dot_gnu_version_sec != nullptr) { if (dot_gnu_version_sec != nullptr) {
// More than one .gnu.version section! // More than one .gnu.version section!
@ -742,7 +731,6 @@ template <class ELFT> void ELFFile<ELFT>::scanDynamicTable() {
if (Phdr.p_type == ELF::PT_DYNAMIC) { if (Phdr.p_type == ELF::PT_DYNAMIC) {
DynamicRegion.Addr = base() + Phdr.p_offset; DynamicRegion.Addr = base() + Phdr.p_offset;
DynamicRegion.Size = Phdr.p_filesz; DynamicRegion.Size = Phdr.p_filesz;
DynamicRegion.EntSize = sizeof(Elf_Dyn);
continue; continue;
} }
if (Phdr.p_type != ELF::PT_LOAD || Phdr.p_filesz == 0) if (Phdr.p_type != ELF::PT_LOAD || Phdr.p_filesz == 0)
@ -763,32 +751,31 @@ template <class ELFT> void ELFFile<ELFT>::scanDynamicTable() {
return this->base() + Phdr.p_offset + Delta; return this->base() + Phdr.p_offset + Delta;
}; };
for (Elf_Dyn_Iter DynI = dynamic_table_begin(), DynE = dynamic_table_end(); for (const Elf_Dyn &Dyn : dynamic_table()) {
DynI != DynE; ++DynI) { switch (Dyn.d_tag) {
switch (DynI->d_tag) {
case ELF::DT_HASH: case ELF::DT_HASH:
if (HashTable) if (HashTable)
continue; continue;
HashTable = HashTable =
reinterpret_cast<const Elf_Hash *>(toMappedAddr(DynI->getPtr())); reinterpret_cast<const Elf_Hash *>(toMappedAddr(Dyn.getPtr()));
break; break;
case ELF::DT_STRTAB: case ELF::DT_STRTAB:
if (!DynStrRegion.Addr) if (!DynStrRegion.Addr)
DynStrRegion.Addr = toMappedAddr(DynI->getPtr()); DynStrRegion.Addr = toMappedAddr(Dyn.getPtr());
break; break;
case ELF::DT_STRSZ: case ELF::DT_STRSZ:
if (!DynStrRegion.Size) if (!DynStrRegion.Size)
DynStrRegion.Size = DynI->getVal(); DynStrRegion.Size = Dyn.getVal();
break; break;
case ELF::DT_RELA: case ELF::DT_RELA:
if (!DynRelaRegion.Addr) if (!DynRelaRegion.Addr)
DynRelaRegion.Addr = toMappedAddr(DynI->getPtr()); DynRelaRegion.Addr = toMappedAddr(Dyn.getPtr());
break; break;
case ELF::DT_RELASZ: case ELF::DT_RELASZ:
DynRelaRegion.Size = DynI->getVal(); DynRelaRegion.Size = Dyn.getVal();
break; break;
case ELF::DT_RELAENT: case ELF::DT_RELAENT:
DynRelaRegion.EntSize = DynI->getVal(); DynRelaRegion.EntSize = Dyn.getVal();
} }
} }
} }
@ -824,24 +811,22 @@ const typename ELFFile<ELFT>::Elf_Sym *ELFFile<ELFT>::symbol_end() const {
} }
template <class ELFT> template <class ELFT>
typename ELFFile<ELFT>::Elf_Dyn_Iter const typename ELFFile<ELFT>::Elf_Dyn *
ELFFile<ELFT>::dynamic_table_begin() const { ELFFile<ELFT>::dynamic_table_begin() const {
if (DynamicRegion.Addr) return reinterpret_cast<const Elf_Dyn *>(DynamicRegion.Addr);
return Elf_Dyn_Iter(DynamicRegion.EntSize,
(const char *)DynamicRegion.Addr);
return Elf_Dyn_Iter(0, nullptr);
} }
template <class ELFT> template <class ELFT>
typename ELFFile<ELFT>::Elf_Dyn_Iter const typename ELFFile<ELFT>::Elf_Dyn *
ELFFile<ELFT>::dynamic_table_end(bool NULLEnd) const { ELFFile<ELFT>::dynamic_table_end(bool NULLEnd) const {
if (!DynamicRegion.Addr) uint64_t Size = DynamicRegion.Size;
return Elf_Dyn_Iter(0, nullptr); if (Size % sizeof(Elf_Dyn))
Elf_Dyn_Iter Ret(DynamicRegion.EntSize, report_fatal_error("Invalid dynamic table size");
(const char *)DynamicRegion.Addr + DynamicRegion.Size);
const Elf_Dyn *Ret = dynamic_table_begin() + Size / sizeof(Elf_Dyn);
if (NULLEnd) { if (NULLEnd) {
Elf_Dyn_Iter Start = dynamic_table_begin(); const Elf_Dyn *Start = dynamic_table_begin();
while (Start != Ret && Start->getTag() != ELF::DT_NULL) while (Start != Ret && Start->getTag() != ELF::DT_NULL)
++Start; ++Start;

10
include/llvm/Object/ELFObjectFile.h
View File

@ -189,8 +189,6 @@ public:
typedef typename ELFFile<ELFT>::Elf_Rela Elf_Rela; typedef typename ELFFile<ELFT>::Elf_Rela Elf_Rela;
typedef typename ELFFile<ELFT>::Elf_Dyn Elf_Dyn; typedef typename ELFFile<ELFT>::Elf_Dyn Elf_Dyn;
typedef typename ELFFile<ELFT>::Elf_Dyn_Iter Elf_Dyn_Iter;
protected: protected:
ELFFile<ELFT> EF; ELFFile<ELFT> EF;
@ -273,9 +271,9 @@ protected:
return DRI; return DRI;
} }
DataRefImpl toDRI(Elf_Dyn_Iter Dyn) const { DataRefImpl toDRI(const Elf_Dyn *Dyn) const {
DataRefImpl DRI; DataRefImpl DRI;
DRI.p = reinterpret_cast<uintptr_t>(Dyn.get()); DRI.p = reinterpret_cast<uintptr_t>(Dyn);
return DRI; return DRI;
} }
@ -783,8 +781,8 @@ section_iterator ELFObjectFile<ELFT>::section_end() const {
template <class ELFT> template <class ELFT>
StringRef ELFObjectFile<ELFT>::getLoadName() const { StringRef ELFObjectFile<ELFT>::getLoadName() const {
Elf_Dyn_Iter DI = EF.dynamic_table_begin(); const Elf_Dyn *DI = EF.dynamic_table_begin();
Elf_Dyn_Iter DE = EF.dynamic_table_end(); const Elf_Dyn *DE = EF.dynamic_table_end();
while (DI != DE && DI->getTag() != ELF::DT_SONAME) while (DI != DE && DI->getTag() != ELF::DT_SONAME)
++DI; ++DI;

BIN
test/Object/Inputs/corrupt-invalid-dynamic-table-size.elf.x86-64 Executable file
View File

Binary file not shown.

6
test/Object/corrupt.test
View File

@ -50,3 +50,9 @@ RUN: %p/Inputs/corrupt-invalid-relocation-size.elf.x86-64 2>&1 | \
RUN: FileCheck --check-prefix=RELOC %s RUN: FileCheck --check-prefix=RELOC %s
RELOC: Invalid relocation entry size RELOC: Invalid relocation entry size
RUN: not llvm-readobj -dyn-relocations \
RUN: %p/Inputs/corrupt-invalid-dynamic-table-size.elf.x86-64 2>&1 | \
RUN: FileCheck --check-prefix=DYN-TABLE-SIZE %s
DYN-TABLE-SIZE: Invalid dynamic table size