[llvm] r365183 - [Object/ELF.h] - Improve error reporting.
George Rimar via llvm-commits
llvm-commits at lists.llvm.org
Fri Jul 5 04:28:50 PDT 2019
Author: grimar
Date: Fri Jul 5 04:28:49 2019
New Revision: 365183
URL: http://llvm.org/viewvc/llvm-project?rev=365183&view=rev
Log:
[Object/ELF.h] - Improve error reporting.
The errors coming from ELF.h are usually not very
useful because they are uninformative. This patch is a
first step to improve the situation.
I tested this patch with a run of check-llvm and found
that few messages are untested. In this patch, I did not
add more tests but marked all such cases with a "TODO" comment.
For all tested messages I extended the error text to
provide more details (see test cases changed).
Differential revision: https://reviews.llvm.org/D64014
Modified:
llvm/trunk/include/llvm/Object/ELF.h
llvm/trunk/lib/Object/ELF.cpp
llvm/trunk/test/Object/elf-invalid-phdr.test
llvm/trunk/test/Object/invalid.test
llvm/trunk/test/tools/llvm-elfabi/binary-read-bad-vaddr.test
llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-e_phoff.test
llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-e_shoff.test
llvm/trunk/test/tools/llvm-readobj/elf-broken-dynsym-link.test
llvm/trunk/test/tools/llvm-readobj/elf-dynamic-malformed.test
Modified: llvm/trunk/include/llvm/Object/ELF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELF.h?rev=365183&r1=365182&r2=365183&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/ELF.h (original)
+++ llvm/trunk/include/llvm/Object/ELF.h Fri Jul 5 04:28:49 2019
@@ -44,10 +44,26 @@ getElfArchType(StringRef Object) {
(uint8_t)Object[ELF::EI_DATA]);
}
-static inline Error createError(StringRef Err) {
+static inline Error createError(const Twine &Err) {
return make_error<StringError>(Err, object_error::parse_failed);
}
+template <class ELFT> class ELFFile;
+
+template <class ELFT>
+std::string getSecIndexForError(const ELFFile<ELFT> *Obj,
+ const typename ELFT::Shdr *Sec) {
+ auto TableOrErr = Obj->sections();
+ if (TableOrErr)
+ return "[index " + std::to_string(Sec - &TableOrErr->front()) + "]";
+ // To make this helper be more convenient for error reporting purposes we
+ // drop the error. But really it should never be triggered. Before this point,
+ // our code should have called 'sections()' and reported a proper error on
+ // failure.
+ llvm::consumeError(TableOrErr.takeError());
+ return "[unknown index]";
+}
+
template <class ELFT>
class ELFFile {
public:
@@ -162,11 +178,16 @@ public:
/// Iterate over program header table.
Expected<Elf_Phdr_Range> program_headers() const {
if (getHeader()->e_phnum && getHeader()->e_phentsize != sizeof(Elf_Phdr))
- return createError("invalid e_phentsize");
+ return createError("invalid e_phentsize: " +
+ Twine(getHeader()->e_phentsize));
if (getHeader()->e_phoff +
(getHeader()->e_phnum * getHeader()->e_phentsize) >
getBufSize())
- return createError("program headers longer than binary");
+ return createError("program headers are longer than binary of size " +
+ Twine(getBufSize()) + ": e_phoff = 0x" +
+ Twine::utohexstr(getHeader()->e_phoff) +
+ ", e_phnum = " + Twine(getHeader()->e_phnum) +
+ ", e_phentsize = " + Twine(getHeader()->e_phentsize));
auto *Begin =
reinterpret_cast<const Elf_Phdr *>(base() + getHeader()->e_phoff);
return makeArrayRef(Begin, Begin + getHeader()->e_phnum);
@@ -181,10 +202,12 @@ public:
/// be checked after iteration ends.
Elf_Note_Iterator notes_begin(const Elf_Phdr &Phdr, Error &Err) const {
if (Phdr.p_type != ELF::PT_NOTE) {
+ // TODO: this error is untested.
Err = createError("attempt to iterate notes of non-note program header");
return Elf_Note_Iterator(Err);
}
if (Phdr.p_offset + Phdr.p_filesz > getBufSize()) {
+ // TODO: this error is untested.
Err = createError("invalid program header offset/size");
return Elf_Note_Iterator(Err);
}
@@ -200,10 +223,12 @@ public:
/// be checked after iteration ends.
Elf_Note_Iterator notes_begin(const Elf_Shdr &Shdr, Error &Err) const {
if (Shdr.sh_type != ELF::SHT_NOTE) {
+ // TODO: this error is untested.
Err = createError("attempt to iterate notes of non-note section");
return Elf_Note_Iterator(Err);
}
if (Shdr.sh_offset + Shdr.sh_size > getBufSize()) {
+ // TODO: this error is untested.
Err = createError("invalid section offset/size");
return Elf_Note_Iterator(Err);
}
@@ -271,7 +296,7 @@ template <class ELFT>
inline Expected<const typename ELFT::Shdr *>
getSection(typename ELFT::ShdrRange Sections, uint32_t Index) {
if (Index >= Sections.size())
- return createError("invalid section index");
+ return createError("invalid section index: " + Twine(Index));
return &Sections[Index];
}
@@ -283,7 +308,10 @@ getExtendedSymbolTableIndex(const typena
assert(Sym->st_shndx == ELF::SHN_XINDEX);
unsigned Index = Sym - FirstSym;
if (Index >= ShndxTable.size())
- return createError("index past the end of the symbol table");
+ return createError(
+ "extended symbol index (" + Twine(Index) +
+ ") is past the end of the SHT_SYMTAB_SHNDX section of size " +
+ Twine(ShndxTable.size()));
// The size of the table was checked in getSHNDXTable.
return ShndxTable[Index];
@@ -333,6 +361,7 @@ template <class ELFT>
inline Expected<const typename ELFT::Sym *>
getSymbol(typename ELFT::SymRange Symbols, uint32_t Index) {
if (Index >= Symbols.size())
+ // TODO: this error is untested.
return createError("invalid symbol index");
return &Symbols[Index];
}
@@ -351,18 +380,26 @@ template <typename T>
Expected<ArrayRef<T>>
ELFFile<ELFT>::getSectionContentsAsArray(const Elf_Shdr *Sec) const {
if (Sec->sh_entsize != sizeof(T) && sizeof(T) != 1)
- return createError("invalid sh_entsize");
+ return createError("section " + getSecIndexForError(this, Sec) +
+ " has an invalid sh_entsize: " + Twine(Sec->sh_entsize));
uintX_t Offset = Sec->sh_offset;
uintX_t Size = Sec->sh_size;
if (Size % sizeof(T))
- return createError("size is not a multiple of sh_entsize");
+ return createError("section " + getSecIndexForError(this, Sec) +
+ " has an invalid sh_size (" + Twine(Size) +
+ ") which is not a multiple of its sh_entsize (" +
+ Twine(Sec->sh_entsize) + ")");
if ((std::numeric_limits<uintX_t>::max() - Offset < Size) ||
Offset + Size > Buf.size())
- return createError("invalid section offset");
+ return createError("section " + getSecIndexForError(this, Sec) +
+ " has a sh_offset (0x" + Twine::utohexstr(Offset) +
+ ") + sh_size (0x" + Twine(Size) +
+ ") that cannot be represented");
if (Offset % alignof(T))
+ // TODO: this error is untested.
return createError("unaligned data");
const T *Start = reinterpret_cast<const T *>(base() + Offset);
@@ -436,6 +473,7 @@ ELFFile<ELFT>::getSectionStringTable(Elf
if (!Index) // no section string table.
return "";
if (Index >= Sections.size())
+ // TODO: this error is untested.
return createError("invalid section index");
return getStringTable(&Sections[Index]);
}
@@ -445,7 +483,9 @@ template <class ELFT> ELFFile<ELFT>::ELF
template <class ELFT>
Expected<ELFFile<ELFT>> ELFFile<ELFT>::create(StringRef Object) {
if (sizeof(Elf_Ehdr) > Object.size())
- return createError("Invalid buffer");
+ return createError("invalid buffer: the size (" + Twine(Object.size()) +
+ ") is smaller than an ELF header (" +
+ Twine(sizeof(Elf_Ehdr)) + ")");
return ELFFile(Object);
}
@@ -456,16 +496,18 @@ Expected<typename ELFT::ShdrRange> ELFFi
return ArrayRef<Elf_Shdr>();
if (getHeader()->e_shentsize != sizeof(Elf_Shdr))
- return createError(
- "invalid section header entry size (e_shentsize) in ELF header");
+ return createError("invalid e_shentsize in ELF header: " +
+ Twine(getHeader()->e_shentsize));
const uint64_t FileSize = Buf.size();
-
if (SectionTableOffset + sizeof(Elf_Shdr) > FileSize)
- return createError("section header table goes past the end of the file");
+ return createError(
+ "section header table goes past the end of the file: e_shoff = 0x" +
+ Twine::utohexstr(SectionTableOffset));
// Invalid address alignment of section headers
if (SectionTableOffset & (alignof(Elf_Shdr) - 1))
+ // TODO: this error is untested.
return createError("invalid alignment of section headers");
const Elf_Shdr *First =
@@ -476,6 +518,7 @@ Expected<typename ELFT::ShdrRange> ELFFi
NumSections = First->sh_size;
if (NumSections > UINT64_MAX / sizeof(Elf_Shdr))
+ // TODO: this error is untested.
return createError("section table goes past the end of file");
const uint64_t SectionTableSize = NumSections * sizeof(Elf_Shdr);
@@ -502,10 +545,14 @@ template <typename T>
Expected<const T *> ELFFile<ELFT>::getEntry(const Elf_Shdr *Section,
uint32_t Entry) const {
if (sizeof(T) != Section->sh_entsize)
+ // TODO: this error is untested.
return createError("invalid sh_entsize");
size_t Pos = Section->sh_offset + Entry * sizeof(T);
if (Pos + sizeof(T) > Buf.size())
- return createError("invalid section offset");
+ return createError("unable to access section " +
+ getSecIndexForError(this, Section) + " data at 0x" +
+ Twine::utohexstr(Pos) +
+ ": offset goes past the end of file");
return reinterpret_cast<const T *>(base() + Pos);
}
@@ -531,6 +578,7 @@ ELFFile<ELFT>::getSection(const StringRe
if (*SecNameOrErr == SectionName)
return &Sec;
}
+ // TODO: this error is untested.
return createError("invalid section name");
}
@@ -538,15 +586,24 @@ template <class ELFT>
Expected<StringRef>
ELFFile<ELFT>::getStringTable(const Elf_Shdr *Section) const {
if (Section->sh_type != ELF::SHT_STRTAB)
- return createError("invalid sh_type for string table, expected SHT_STRTAB");
+ return createError("invalid sh_type for string table section " +
+ getSecIndexForError(this, Section) +
+ ": expected SHT_STRTAB, but got " +
+ object::getELFSectionTypeName(getHeader()->e_machine,
+ Section->sh_type));
auto V = getSectionContentsAsArray<char>(Section);
if (!V)
return V.takeError();
ArrayRef<char> Data = *V;
if (Data.empty())
+ // TODO: this error is untested.
return createError("empty string table");
if (Data.back() != '\0')
- return createError("string table non-null terminated");
+ return createError(object::getELFSectionTypeName(getHeader()->e_machine,
+ Section->sh_type) +
+ " string table section " +
+ getSecIndexForError(this, Section) +
+ " is non-null terminated");
return StringRef(Data.begin(), Data.size());
}
@@ -574,9 +631,13 @@ ELFFile<ELFT>::getSHNDXTable(const Elf_S
const Elf_Shdr &SymTable = **SymTableOrErr;
if (SymTable.sh_type != ELF::SHT_SYMTAB &&
SymTable.sh_type != ELF::SHT_DYNSYM)
+ // TODO: this error is untested.
return createError("invalid sh_type");
if (V.size() != (SymTable.sh_size / sizeof(Elf_Sym)))
- return createError("invalid section contents size");
+ return createError("SHT_SYMTAB_SHNDX section has sh_size (" +
+ Twine(SymTable.sh_size) +
+ ") which is not equal to the number of symbols (" +
+ Twine(V.size()) + ")");
return V;
}
@@ -595,6 +656,7 @@ ELFFile<ELFT>::getStringTableForSymtab(c
Elf_Shdr_Range Sections) const {
if (Sec.sh_type != ELF::SHT_SYMTAB && Sec.sh_type != ELF::SHT_DYNSYM)
+ // TODO: this error is untested.
return createError(
"invalid sh_type for symbol table, expected SHT_SYMTAB or SHT_DYNSYM");
auto SectionOrErr = object::getSection<ELFT>(Sections, Sec.sh_link);
@@ -622,7 +684,11 @@ Expected<StringRef> ELFFile<ELFT>::getSe
if (Offset == 0)
return StringRef();
if (Offset >= DotShstrtab.size())
- return createError("invalid string offset");
+ return createError("a section " + getSecIndexForError(this, Section) +
+ " has an invalid sh_name (0x" +
+ Twine::utohexstr(Offset) +
+ ") offset which goes past the end of the "
+ "section name string table");
return StringRef(DotShstrtab.data() + Offset);
}
Modified: llvm/trunk/lib/Object/ELF.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/ELF.cpp?rev=365183&r1=365182&r2=365183&view=diff
==============================================================================
--- llvm/trunk/lib/Object/ELF.cpp (original)
+++ llvm/trunk/lib/Object/ELF.cpp Fri Jul 5 04:28:49 2019
@@ -537,12 +537,15 @@ Expected<typename ELFT::DynRange> ELFFil
}
if (Dyn.empty())
+ // TODO: this error is untested.
return createError("invalid empty dynamic section");
if (DynSecSize % sizeof(Elf_Dyn) != 0)
+ // TODO: this error is untested.
return createError("malformed dynamic section");
if (Dyn.back().d_tag != ELF::DT_NULL)
+ // TODO: this error is untested.
return createError("dynamic sections must be DT_NULL terminated");
return Dyn;
@@ -567,12 +570,14 @@ Expected<const uint8_t *> ELFFile<ELFT>:
});
if (I == LoadSegments.begin())
- return createError("Virtual address is not in any segment");
+ return createError("virtual address is not in any segment: 0x" +
+ Twine::utohexstr(VAddr));
--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 createError("virtual address is not in any segment: 0x" +
+ Twine::utohexstr(VAddr));
return base() + Phdr.p_offset + Delta;
}
Modified: llvm/trunk/test/Object/elf-invalid-phdr.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/elf-invalid-phdr.test?rev=365183&r1=365182&r2=365183&view=diff
==============================================================================
--- llvm/trunk/test/Object/elf-invalid-phdr.test (original)
+++ llvm/trunk/test/Object/elf-invalid-phdr.test Fri Jul 5 04:28:49 2019
@@ -23,4 +23,4 @@
RUN: not llvm-objdump -private-headers %p/Inputs/invalid-phdr.elf 2>&1 \
RUN: | FileCheck %s
-CHECK: LLVM ERROR: program headers longer than binary
+CHECK: LLVM ERROR: program headers are longer than binary of size 4162: e_phoff = 0xffffff, e_phnum = 1, e_phentsize = 56
\ No newline at end of file
Modified: llvm/trunk/test/Object/invalid.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/invalid.test?rev=365183&r1=365182&r2=365183&view=diff
==============================================================================
--- llvm/trunk/test/Object/invalid.test (original)
+++ llvm/trunk/test/Object/invalid.test Fri Jul 5 04:28:49 2019
@@ -4,7 +4,7 @@
# RUN: yaml2obj %s --docnum=1 -o %t1
# RUN: not llvm-objdump -s %t1 2>&1 | FileCheck %s --check-prefix=INVALIDERR
-# INVALIDERR: Invalid data was encountered while parsing the file
+# INVALIDERR: error: reading file: Invalid data was encountered while parsing the file
--- !ELF
FileHeader:
@@ -45,7 +45,7 @@ Sections:
# RUN: yaml2obj %s --docnum=3 -o %t3
# RUN: not llvm-dwarfdump -debug-line %t3 2>&1 | FileCheck --check-prefix=RELA %s
-# RELA: Section is not SHT_RELA
+# RELA: LLVM ERROR: Section is not SHT_RELA
--- !ELF
FileHeader:
@@ -91,7 +91,7 @@ Sections:
# RUN: yaml2obj %s --docnum=5 -o %t5
# RUN: not llvm-objdump -syms %t5 2>&1 | FileCheck --check-prefix=NONULL %s
-# NONULL: string table non-null terminated
+# NONULL: error: {{.*}}: SHT_STRTAB string table section [index 1] is non-null terminated
--- !ELF
FileHeader:
@@ -111,7 +111,7 @@ Symbols:
# RUN: yaml2obj %s --docnum=6 -o %t6
# RUN: not llvm-readobj --symbols %t6 2>&1 | FileCheck --check-prefix=INVALID-SYM-SIZE %s
-# INVALID-SYM-SIZE: invalid sh_entsize
+# INVALID-SYM-SIZE: error: section [index 1] has an invalid sh_entsize: 32
--- !ELF
FileHeader:
@@ -152,7 +152,7 @@ DynamicSymbols:
# RUN: yaml2obj %s --docnum=8 -o %t8
# RUN: not llvm-readobj --symbols %t8 2>&1 | FileCheck --check-prefix=INVALID-SYMTAB-LINK %s
-# INVALID-SYMTAB-LINK: invalid section index
+# INVALID-SYMTAB-LINK: error: invalid section index: 255
--- !ELF
FileHeader:
@@ -171,7 +171,7 @@ Sections:
# RUN: yaml2obj %s --docnum=9 -o %t9
# RUN: not llvm-readobj -S %t9 2>&1 | FileCheck --check-prefix=INVALID-SH-ENTSIZE %s
-# INVALID-SH-ENTSIZE: invalid section header entry size (e_shentsize) in ELF header
+# INVALID-SH-ENTSIZE: error: {{.*}}: invalid e_shentsize in ELF header: 1
--- !ELF
FileHeader:
@@ -187,7 +187,7 @@ FileHeader:
# RUN: yaml2obj %s --docnum=10 -o %t10
# RUN: not llvm-readobj --symbols %t10 2>&1 | FileCheck --check-prefix=INVALID-SYMTAB-SIZE %s
-# INVALID-SYMTAB-SIZE: size is not a multiple of sh_entsize
+# INVALID-SYMTAB-SIZE: error: section [index 1] has an invalid sh_size (1) which is not a multiple of its sh_entsize (24)
--- !ELF
FileHeader:
@@ -207,7 +207,7 @@ Sections:
# RUN: yaml2obj %s --docnum=11 -o %t11
# RUN: not llvm-readobj --symbols %t11 2>&1 | FileCheck --check-prefix=INVALID-XINDEX-SIZE %s
-# INVALID-XINDEX-SIZE: invalid section contents size
+# INVALID-XINDEX-SIZE: error: {{.*}}: SHT_SYMTAB_SHNDX section has sh_size (24) which is not equal to the number of symbols (6)
--- !ELF
FileHeader:
@@ -227,7 +227,7 @@ Sections:
# RUN: not llvm-readobj --program-headers %p/Inputs/invalid-e_shnum.elf 2>&1 | \
# RUN: FileCheck --check-prefix=INVALID-PH-ENTSIZE %s
-# INVALID-PH-ENTSIZE: invalid e_phentsize
+# INVALID-PH-ENTSIZE: error: invalid e_phentsize: 12336
## Check that llvm-readobj reports an error when we have no SHT_SYMTAB_SHNDX section,
## but have a symbol referencing it.
@@ -235,7 +235,7 @@ Sections:
# RUN: not llvm-readobj --symbols %p/Inputs/invalid-ext-symtab-index.elf-x86-64 2>&1 | \
# RUN: FileCheck --check-prefix=INVALID-EXT-SYMTAB-INDEX %s
-# INVALID-EXT-SYMTAB-INDEX: index past the end of the symbol table
+# INVALID-EXT-SYMTAB-INDEX: error: extended symbol index (0) is past the end of the SHT_SYMTAB_SHNDX section of size 0
## Check that llvm-readobj reports an error if a relocation section
## has a broken sh_offset (past the end of the file).
@@ -245,7 +245,7 @@ Sections:
# RUN: not llvm-readobj -r %t12 2>&1 | FileCheck --check-prefix=INVALID-RELOC-SH-OFFSET %s
# RUN: not llvm-readobj -r %t13 2>&1 | FileCheck --check-prefix=INVALID-RELOC-SH-OFFSET %s
-# INVALID-RELOC-SH-OFFSET: invalid section offset
+# INVALID-RELOC-SH-OFFSET: error: section [index 1] has a sh_offset (0x10000) + sh_size (0x0) that cannot be represented
--- !ELF
FileHeader:
@@ -275,7 +275,7 @@ Sections:
# RUN: yaml2obj %s --docnum=14 -o %t14
# RUN: not llvm-readobj --symbols %t14 2>&1 | FileCheck --check-prefix=INVALID-SECTION-SIZE2 %s
-# INVALID-SECTION-SIZE2: invalid section offset
+# INVALID-SECTION-SIZE2: error: section [index 1] has a sh_offset (0xffffffff) + sh_size (0x27) that cannot be represented
--- !ELF
FileHeader:
@@ -294,8 +294,8 @@ Sections:
# RUN: yaml2obj %s --docnum=15 -o %t15
# RUN: not llvm-readobj -S %t15 2>&1 | FileCheck --check-prefix=INVALID-SECTION-NUM %s
-# INVALID-SECTION-NUM: section table goes past the end of file
-
+# INVALID-SECTION-NUM: error: {{.*}}: section table goes past the end of file
+
--- !ELF
FileHeader:
Class: ELFCLASS64
@@ -310,7 +310,7 @@ FileHeader:
# RUN: yaml2obj %s --docnum=16 -o %t16
# RUN: not llvm-readobj -r %t16 2>&1 | FileCheck --check-prefix=INVALID-REL-SYM %s
-# INVALID-REL-SYM: invalid section offset
+# INVALID-REL-SYM: error: unable to access section [index 2] data at 0x18000180: offset goes past the end of file
--- !ELF
FileHeader:
@@ -335,7 +335,7 @@ Sections:
# RUN: echo -e -n "\x7f\x45\x4c\x46\x02\x01\x01\x03\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00" > %t11
# RUN: not llvm-readobj -r %t11 2>&1 | FileCheck --check-prefix=INVALID-BUFFER %s
-# INVALID-BUFFER: Invalid buffer
+# INVALID-BUFFER: error: {{.*}}': invalid buffer: the size (18) is smaller than an ELF header (64)
# RUN: not llvm-readobj %p/Inputs/invalid-coff-header-too-small 2>&1 | FileCheck --check-prefix=COFF-HEADER %s
# COFF-HEADER: The file was not recognized as a valid object file
@@ -346,7 +346,7 @@ Sections:
# RUN: yaml2obj %s --docnum=17 -o %t17
# RUN: not llvm-readobj --sections %t17 2>&1 | FileCheck --check-prefix=BROKEN-SECNAME %s
-## BROKEN-SECNAME: invalid string offset
+## BROKEN-SECNAME: error: a section [index 1] has an invalid sh_name (0x1) offset which goes past the end of the section name string table
--- !ELF
FileHeader:
@@ -366,7 +366,7 @@ Sections:
# RUN: not llvm-readobj --sections --section-data %t18 2>&1 \
# RUN: | FileCheck --check-prefix=BROKEN-SECSHOFFSET %s
-# BROKEN-SECSHOFFSET: invalid section offset
+# BROKEN-SECSHOFFSET: error: section [index 1] has a sh_offset (0xffff0000) + sh_size (0x0) that cannot be represented
--- !ELF
FileHeader:
@@ -427,7 +427,7 @@ DynamicSymbols:
# RUN: not llvm-readobj -l %p/Inputs/corrupt-invalid-phentsize.elf.x86-64 2>&1 \
# RUN: | FileCheck --check-prefix=PHENTSIZE %s
-# PHENTSIZE: invalid e_phentsize
+# PHENTSIZE: error: invalid e_phentsize: 57
## The dynamic table contains DT_STRTAB with a value that is not in any loadable segment.
## Check llvm-readobj reports it.
@@ -435,7 +435,7 @@ DynamicSymbols:
# RUN: yaml2obj %s --docnum=21 -o %t21
# RUN: llvm-readobj --dynamic-table %t21 2>&1 | FileCheck --check-prefix=INVALID-DTSTRTAB %s
-# INVALID-DTSTRTAB: warning: Unable to parse DT_STRTAB: Virtual address is not in any segment
+# INVALID-DTSTRTAB: warning: Unable to parse DT_STRTAB: virtual address is not in any segment: 0xffff0000
--- !ELF
FileHeader:
@@ -465,7 +465,7 @@ ProgramHeaders:
# RUN: %p/Inputs/corrupt-invalid-relocation-size.elf.x86-64 2>&1 \
# RUN: | FileCheck --check-prefix=RELOC-BROKEN-ENTSIZE %s
-# RELOC-BROKEN-ENTSIZE: Invalid entity size
+# RELOC-BROKEN-ENTSIZE: error: Invalid entity size
## Check that llvm-readobj reports an error when .dynamic section has an invalid
## size, which isn't a multiple of the dynamic entry size.
@@ -473,7 +473,7 @@ ProgramHeaders:
# RUN: yaml2obj %s --docnum=22 -o %t22
# RUN: not llvm-readobj --dyn-relocations %t22 2>&1 | FileCheck --check-prefix=DYN-TABLE-SIZE %s
-# DYN-TABLE-SIZE: Invalid entity size
+# DYN-TABLE-SIZE: error: Invalid entity size
--- !ELF
FileHeader:
Modified: llvm/trunk/test/tools/llvm-elfabi/binary-read-bad-vaddr.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-elfabi/binary-read-bad-vaddr.test?rev=365183&r1=365182&r2=365183&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-elfabi/binary-read-bad-vaddr.test (original)
+++ llvm/trunk/test/tools/llvm-elfabi/binary-read-bad-vaddr.test Fri Jul 5 04:28:49 2019
@@ -47,4 +47,4 @@ ProgramHeaders:
Sections:
- Section: .dynamic
-# CHECK: Virtual address is not in any segment when locating .dynstr section contents
+# CHECK: virtual address is not in any segment: 0x260 when locating .dynstr section contents
Modified: llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-e_phoff.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-e_phoff.test?rev=365183&r1=365182&r2=365183&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-e_phoff.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-e_phoff.test Fri Jul 5 04:28:49 2019
@@ -13,11 +13,13 @@
## Truncate the file to end before the program header table ends.
# RUN: %python -c "with open('%/t.o', 'r+b') as input: input.truncate(65)"
-# RUN: not llvm-objcopy %t.o 2>&1 | FileCheck %s
+# RUN: not llvm-objcopy %t.o 2>&1 | FileCheck %s --check-prefix=CASE1
+
+# CASE1: error: program headers are longer than binary of size 65: e_phoff = 0x40, e_phnum = 1, e_phentsize = 56
## Set the e_phoff field to a value much larger than the object file size.
# RUN: %python -c "with open('%/t2.o', 'r+b') as input: import struct; bytes = struct.pack('<Q', 0x40000000); input.seek(32); input.write(bytes)"
-# RUN: not llvm-objcopy %t2.o 2>&1 | FileCheck %s
+# RUN: not llvm-objcopy %t2.o 2>&1 | FileCheck %s --check-prefix=CASE2
--- !ELF
FileHeader:
@@ -28,4 +30,4 @@ FileHeader:
ProgramHeaders:
- Type: PT_LOAD
-# CHECK: error: program headers longer than binary
+# CASE2: error: program headers are longer than binary of size 120: e_phoff = 0x40000000, e_phnum = 1, e_phentsize = 56
Modified: llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-e_shoff.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-e_shoff.test?rev=365183&r1=365182&r2=365183&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-e_shoff.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/invalid-e_shoff.test Fri Jul 5 04:28:49 2019
@@ -11,11 +11,13 @@
## Truncate the file to end before the section header table ends.
# RUN: %python -c "with open('%/t.o', 'r+b') as input: input.truncate(65)"
-# RUN: not llvm-objcopy %t.o 2>&1 | FileCheck %s -DINPUT=%t.o
+# RUN: not llvm-objcopy %t.o 2>&1 | FileCheck %s -DINPUT=%t.o --check-prefix=CASE1
+
+# CASE1: error: '[[INPUT]]': section header table goes past the end of the file: e_shoff = 0x40
## Set the e_shoff field to a value much larger than the object file size.
# RUN: %python -c "with open('%/t2.o', 'r+b') as input: import struct; bytes = struct.pack('<Q', 0x40000000); input.seek(40); input.write(bytes)"
-# RUN: not llvm-objcopy %t2.o 2>&1 | FileCheck %s -DINPUT=%t2.o
+# RUN: not llvm-objcopy %t2.o 2>&1 | FileCheck %s -DINPUT=%t2.o --check-prefix=CASE2
--- !ELF
FileHeader:
@@ -27,4 +29,4 @@ Sections:
- Name: .foo
Type: SHT_PROGBITS
-# CHECK: error: '[[INPUT]]': section header table goes past the end of the file
+# CASE2: error: '[[INPUT]]': section header table goes past the end of the file: e_shoff = 0x40000000
Modified: llvm/trunk/test/tools/llvm-readobj/elf-broken-dynsym-link.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/elf-broken-dynsym-link.test?rev=365183&r1=365182&r2=365183&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/elf-broken-dynsym-link.test (original)
+++ llvm/trunk/test/tools/llvm-readobj/elf-broken-dynsym-link.test Fri Jul 5 04:28:49 2019
@@ -6,7 +6,7 @@
# RUN: llvm-readobj -S %t1 2>&1 | FileCheck %s --check-prefixes=LLVM,ERR
# RUN: llvm-readelf -S %t1 2>&1 | FileCheck %s --check-prefixes=GNU,ERR
-# ERR: warning: invalid sh_type for string table, expected SHT_STRTAB
+# ERR: warning: invalid sh_type for string table section [index 0]: expected SHT_STRTAB, but got SHT_NULL
# LLVM: Name: .dynsym
# LLVM-NEXT: Type: SHT_DYNSYM
Modified: llvm/trunk/test/tools/llvm-readobj/elf-dynamic-malformed.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-readobj/elf-dynamic-malformed.test?rev=365183&r1=365182&r2=365183&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-readobj/elf-dynamic-malformed.test (original)
+++ llvm/trunk/test/tools/llvm-readobj/elf-dynamic-malformed.test Fri Jul 5 04:28:49 2019
@@ -141,7 +141,7 @@ ProgramHeaders:
# RUN: llvm-readobj --dynamic-table %t.bad-strtab 2>&1 >/dev/null | FileCheck %s --check-prefix BAD-STRTAB-ERR
# RUN: llvm-readelf --dynamic-table %t.bad-strtab 2>&1 >/dev/null | FileCheck %s --check-prefix BAD-STRTAB-ERR
-# BAD-STRTAB-ERR: warning: Unable to parse DT_STRTAB: Virtual address is not in any segment
+# BAD-STRTAB-ERR: warning: Unable to parse DT_STRTAB: virtual address is not in any segment: 0x2000000
# RUN: llvm-readobj --dynamic-table --needed-libs %t.bad-strtab | FileCheck %s --check-prefixes=BAD-STRTAB,BAD-STRTAB-LLVM
# RUN: llvm-readelf --dynamic-table --needed-libs %t.bad-strtab | FileCheck %s --check-prefixes=BAD-STRTAB,BAD-STRTAB-GNU
@@ -186,7 +186,8 @@ ProgramHeaders:
# RUN: llvm-readobj --dynamic-table %t.bad-rela 2>&1 | FileCheck %s --check-prefixes=CHECK,BAD-RELA
# RUN: llvm-readelf --dynamic-table %t.bad-rela 2>&1 | FileCheck %s --check-prefixes=CHECK,BAD-RELA-GNU
-# CHECK: warning: Unable to parse DT_RELA: Virtual address is not in any segment
+# CHECK: warning: Unable to parse DT_RELA: virtual address is not in any segment: 0x1000000
+
# BAD-RELA: DynamicSection [ (2 entries)
# BAD-RELA-NEXT: Tag Type Name/Value
# BAD-RELA-NEXT: 0x0000000000000007 RELA 0x1000000
More information about the llvm-commits
mailing list