diff options
| -rw-r--r-- | llvm/include/llvm/Object/ELF.h | 3 | ||||
| -rw-r--r-- | llvm/test/Object/Inputs/invalid-section-size2.elf | bin | 0 -> 938 bytes | |||
| -rw-r--r-- | llvm/test/Object/invalid.test | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/llvm/include/llvm/Object/ELF.h b/llvm/include/llvm/Object/ELF.h index b6d4b804c27..d1de25d2821 100644 --- a/llvm/include/llvm/Object/ELF.h +++ b/llvm/include/llvm/Object/ELF.h @@ -229,7 +229,8 @@ ELFFile<ELFT>::getSectionContentsAsArray(const Elf_Shdr *Sec) const { if (Size % sizeof(T)) return object_error::parse_failed; - if (Offset + Size > Buf.size()) + if ((std::numeric_limits<uintX_t>::max() - Offset < Size) || + Offset + Size > Buf.size()) return object_error::parse_failed; const T *Start = reinterpret_cast<const T *>(base() + Offset); diff --git a/llvm/test/Object/Inputs/invalid-section-size2.elf b/llvm/test/Object/Inputs/invalid-section-size2.elf Binary files differnew file mode 100644 index 00000000000..5b7b5bca48a --- /dev/null +++ b/llvm/test/Object/Inputs/invalid-section-size2.elf diff --git a/llvm/test/Object/invalid.test b/llvm/test/Object/invalid.test index 352917987de..a0016fef9d5 100644 --- a/llvm/test/Object/invalid.test +++ b/llvm/test/Object/invalid.test @@ -72,3 +72,7 @@ INVALID-RELOC-SH-OFFSET: Invalid data was encountered while parsing the file RUN: not llvm-readobj -t %p/Inputs/invalid-sections-address-alignment.x86-64 2>&1 | \ RUN: FileCheck --check-prefix=INVALID-SEC-ADDRESS-ALIGNMENT %s INVALID-SEC-ADDRESS-ALIGNMENT: Invalid data was encountered while parsing the file + +RUN: not llvm-readobj -t %p/Inputs/invalid-section-size2.elf 2>&1 | \ +RUN: FileCheck --check-prefix=INVALID-SECTION-SIZE2 %s +INVALID-SECTION-SIZE2: Invalid data was encountered while parsing the file. |
