RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

[llvm-readobj/elf] - Refine the warning about the broken PT_DYNAMIC segment.

Browse Source 
Splitted out from D85519.

Currently we report "PT_DYNAMIC segment offset + size exceeds the size of the file",
this changes it to
"PT_DYNAMIC segment offset (0x1234) + file size (0x5678) exceeds the size of the file (0x68ab)"

Differential revision: https://reviews.llvm.org/D85654
This commit is contained in:
Georgii Rymar 2020-08-10 17:50:16 +03:00
parent 8366289c89
commit cd6681160b
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Object/invalid.test
View File

@ -489,7 +489,7 @@ Sections:
# RUN: yaml2obj %s --docnum=22 -o %t22 # RUN: yaml2obj %s --docnum=22 -o %t22
# RUN: llvm-readobj --dyn-relocations %t22 2>&1 | FileCheck -DFILE=%t22 --check-prefix=DYN-TABLE-PHDR %s # RUN: llvm-readobj --dyn-relocations %t22 2>&1 | FileCheck -DFILE=%t22 --check-prefix=DYN-TABLE-PHDR %s
# DYN-TABLE-PHDR: warning: '[[FILE]]': PT_DYNAMIC segment offset + size exceeds the size of the file # DYN-TABLE-PHDR: warning: '[[FILE]]': PT_DYNAMIC segment offset (0xffff0000) + file size (0x0) exceeds the size of the file (0x150)
--- !ELF --- !ELF
FileHeader: FileHeader:
@ -506,7 +506,9 @@ ProgramHeaders:
# RUN: yaml2obj %s --docnum=23 -o %t23 # RUN: yaml2obj %s --docnum=23 -o %t23
# RUN: llvm-readobj --dyn-relocations %t23 2>&1 \ # RUN: llvm-readobj --dyn-relocations %t23 2>&1 \
# RUN: | FileCheck -DFILE=%t23 --check-prefix=DYN-TABLE-PHDR %s # RUN: | FileCheck -DFILE=%t23 --check-prefix=DYN-TABLE-PHDR2 %s
# DYN-TABLE-PHDR2: warning: '[[FILE]]': PT_DYNAMIC segment offset (0x78) + file size (0xffff0000) exceeds the size of the file (0x1a8)
--- !ELF --- !ELF
FileHeader: FileHeader:

10
test/tools/llvm-readobj/ELF/malformed-pt-dynamic.test
View File

@ -13,14 +13,18 @@
# within the file. # within the file.
# RUN: cp %t.stripped %t.truncated1 # RUN: cp %t.stripped %t.truncated1
# RUN: %python -c "with open(r'%t.truncated1', 'r+') as f: f.truncate(0x1001)" # RUN: %python -c "with open(r'%t.truncated1', 'r+') as f: f.truncate(0x1001)"
# RUN: llvm-readobj %t.truncated1 --dynamic-table 2>&1 | FileCheck -DFILE=%t.truncated1 %s # RUN: llvm-readobj %t.truncated1 --dynamic-table 2>&1 | \
# RUN: FileCheck -DFILE=%t.truncated1 %s --check-prefix=WARN1
# WARN1: warning: '[[FILE]]': PT_DYNAMIC segment offset (0x1000) + file size (0x10) exceeds the size of the file (0x1001)
# Test case where the offset is too large to be in the file. # Test case where the offset is too large to be in the file.
# RUN: cp %t.stripped %t.truncated2 # RUN: cp %t.stripped %t.truncated2
# RUN: %python -c "with open(r'%t.truncated2', 'r+') as f: f.truncate(0xFFF)" # RUN: %python -c "with open(r'%t.truncated2', 'r+') as f: f.truncate(0xFFF)"
# RUN: llvm-readobj %t.truncated2 --dynamic-table 2>&1 | FileCheck -DFILE=%t.truncated2 %s # RUN: llvm-readobj %t.truncated2 --dynamic-table 2>&1 | \
# RUN: FileCheck -DFILE=%t.truncated2 %s --check-prefix=WARN2
# CHECK: warning: '[[FILE]]': PT_DYNAMIC segment offset + size exceeds the size of the file # WARN2: warning: '[[FILE]]': PT_DYNAMIC segment offset (0x1000) + file size (0x10) exceeds the size of the file (0xfff)
--- !ELF --- !ELF
FileHeader: FileHeader:

10
tools/llvm-readobj/ELFDumper.cpp
View File

@ -1894,10 +1894,12 @@ ELFDumper<ELFT>::findDynamic(const ELFFile<ELFT> *Obj) {
if (DynamicPhdr && DynamicPhdr->p_offset + DynamicPhdr->p_filesz > if (DynamicPhdr && DynamicPhdr->p_offset + DynamicPhdr->p_filesz >
ObjF->getMemoryBufferRef().getBufferSize()) { ObjF->getMemoryBufferRef().getBufferSize()) {
reportWarning( reportUniqueWarning(createError(
createError( "PT_DYNAMIC segment offset (0x" +
"PT_DYNAMIC segment offset + size exceeds the size of the file"), Twine::utohexstr(DynamicPhdr->p_offset) + ") + file size (0x" +
ObjF->getFileName()); Twine::utohexstr(DynamicPhdr->p_filesz) +
") exceeds the size of the file (0x" +
Twine::utohexstr(ObjF->getMemoryBufferRef().getBufferSize()) + ")"));
// Don't use the broken dynamic header. // Don't use the broken dynamic header.
DynamicPhdr = nullptr; DynamicPhdr = nullptr;
} }