This is an archive of the discontinued LLVM Phabricator instance.

Differential D76282

[obj2yaml] - SHT_REL*, SHT_DYNAMIC sections: add tests to document the behavior when sh_entsize is broken.
ClosedPublic

Authored by grimar on Mar 17 2020, 6:56 AM.

Details

Reviewers
jhenderson
MaskRay
Commits
rG9c69cc109bc0: [obj2yaml] - SHT_REL*, SHT_DYNAMIC sections: add tests to document the behavior…
Summary

We do not have tests that shows the current behavior.
It is useful for D76227 which changes the logic of dumping of EntSize fields.

Depends on D76281

Diff Detail

Event Timeline

grimar created this revision.Mar 17 2020, 6:56 AM
grimar edited the summary of this revision. (Show Details)
grimar added a parent revision: D76281: [obj2yaml] - Stop dumping an empty sh_info field for SHT_RELA/SHT_REL sections..
MaskRay accepted this revision.Mar 17 2020, 8:20 AM
This revision is now accepted and ready to land.Mar 17 2020, 8:20 AM
jhenderson accepted this revision.Mar 19 2020, 3:00 AM

LGTM, with comment updates.

llvm/test/tools/obj2yaml/dynamic-section.test
254

Maybe just change this comment to "Test the behavior when ..." since presumably when you fix it, you'll just update the test case.

Optionally then add a FIXME saying how it should change.

llvm/test/tools/obj2yaml/rel-rela-section.yaml
32

Same as above.

llvm/test/tools/obj2yaml/relr-section.yaml
71

"dump a SHT_RELR" (or possibly "dump an SHT_RELR" - I'm not sure what the English grammar rules are here!)

Closed by commit rG9c69cc109bc0: [obj2yaml] - SHT_REL*, SHT_DYNAMIC sections: add tests to document the behavior… (authored by grimar). · Explain WhyMar 19 2020, 7:00 AM
This revision was automatically updated to reflect the committed changes.
grimar marked 3 inline comments as done.
Herald added a project: Restricted Project. · View Herald TranscriptMar 19 2020, 7:00 AM

Revision Contents

PathSize
llvm/
test/
tools/
obj2yaml/
16 lines
21 lines
162 lines

Diff 251371

llvm/test/tools/obj2yaml/dynamic-section.test

# RUN: yaml2obj %s -o %t
# RUN: obj2yaml %t | FileCheck %s
## Check we can use obj2yaml to yamalize the object containing ## Check we can use obj2yaml to yamalize the object containing
## .dynamic section. Check that resulting section has the ## .dynamic section. Check that resulting section has the
## proper attributes and dynamic tags. ## proper attributes and dynamic tags.
# RUN: yaml2obj -DENTSIZE=0x10 %s -o %t1
# RUN: obj2yaml %t1 | FileCheck %s
# CHECK: Sections: # CHECK: Sections:
# CHECK-NEXT: - Name: .dynamic # CHECK-NEXT: - Name: .dynamic
# CHECK-NEXT: Type: SHT_DYNAMIC # CHECK-NEXT: Type: SHT_DYNAMIC
# CHECK-NEXT: Address: 0x0000000000001000 # CHECK-NEXT: Address: 0x0000000000001000
# CHECK-NEXT: AddressAlign: 0x0000000000002000 # CHECK-NEXT: AddressAlign: 0x0000000000002000
# CHECK-NEXT: EntSize: 0x0000000000000010 # CHECK-NEXT: EntSize: 0x0000000000000010
# CHECK-NEXT: Entries: # CHECK-NEXT: Entries:
# CHECK-NEXT: - Tag: DT_NULL # CHECK-NEXT: - Tag: DT_NULL
▲ Show 20 Lines • Show All 115 Lines • ▼ Show 20 LinesFileHeader:
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_DYN Type: ET_DYN
Machine: EM_X86_64 Machine: EM_X86_64
Sections: Sections:
- Name: .dynamic - Name: .dynamic
Type: SHT_DYNAMIC Type: SHT_DYNAMIC
Address: 0x0000000000001000 Address: 0x0000000000001000
AddressAlign: 0x0000000000002000 AddressAlign: 0x0000000000002000
EntSize: 0x0000000000000010 EntSize: [[ENTSIZE]]
Entries: Entries:
- Tag: DT_NULL - Tag: DT_NULL
Value: 0x0000000000000000 Value: 0x0000000000000000
- Tag: DT_NEEDED - Tag: DT_NEEDED
Value: 0x0000000000000001 Value: 0x0000000000000001
- Tag: DT_PLTRELSZ - Tag: DT_PLTRELSZ
Value: 0x0000000000000002 Value: 0x0000000000000002
- Tag: DT_PLTGOT - Tag: DT_PLTGOT
▲ Show 20 Lines • Show All 97 Lines • ▼ Show 20 Lines Entries:
- Tag: DT_VERDEFNUM - Tag: DT_VERDEFNUM
Value: 0x0000000000000034 Value: 0x0000000000000034
- Tag: DT_VERNEED - Tag: DT_VERNEED
Value: 0x0000000000000035 Value: 0x0000000000000035
- Tag: DT_VERNEEDNUM - Tag: DT_VERNEEDNUM
Value: 0x0000000000000036 Value: 0x0000000000000036
- Tag: DT_USED - Tag: DT_USED
Value: 0x0000000000000001 Value: 0x0000000000000001
## Test the behavior when sh_entsize is invalid.
jhendersonUnsubmitted
Done
ReplyInline Actions

Maybe just change this comment to "Test the behavior when ..." since presumably when you fix it, you'll just update the test case.

Optionally then add a FIXME saying how it should change.

jhenderson: Maybe just change this comment to "Test the behavior when ..." since presumably when you fix it…
## Here we use 0xFE as an arbitrary broken value instead of expected 0x16.
# RUN: yaml2obj -DENTSIZE=0xff %s -o %t2
# RUN: not obj2yaml %t2 2>&1 | FileCheck %s --check-prefix=ENTSIZE
# ENTSIZE: section [index 1] has an invalid sh_entsize: 255

llvm/test/tools/obj2yaml/rel-rela-section.yaml

Show All 23 LinesFileHeader:
Machine: EM_X86_64 Machine: EM_X86_64
Sections: Sections:
- Name: .rela.dyn - Name: .rela.dyn
Type: SHT_RELA Type: SHT_RELA
- Name: .rel.dyn - Name: .rel.dyn
Type: SHT_REL Type: SHT_REL
## Trigger the .dynsym emission. ## Trigger the .dynsym emission.
DynamicSymbols: [] DynamicSymbols: []
jhendersonUnsubmitted
Done
ReplyInline Actions

Same as above.

jhenderson: Same as above.
## Test the behavior when the sh_entsize field is broken.
## Here we use the 0xFE value instead of expected 0x18/0x10.
# RUN: yaml2obj -DTYPE=SHT_RELA --docnum=2 %s -o %t2.rela
# RUN: not obj2yaml %t2.rela 2>&1 | FileCheck %s --check-prefix=ERR
# RUN: yaml2obj -DTYPE=SHT_REL --docnum=2 %s -o %t2.rel
# RUN: not obj2yaml %t2.rel 2>&1 | FileCheck %s --check-prefix=ERR
# ERR: section [index 1] has an invalid sh_entsize: 254
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_DYN
Machine: EM_X86_64
Sections:
- Name: .foo
Type: [[TYPE]]
EntSize: 0xFE

llvm/test/tools/obj2yaml/relr-section.yaml

## Test how we dump SHT_RELR sections for 32 and 64-bit targets. ## Test how we dump SHT_RELR sections for 32 and 64-bit targets.
## Test we use the "Entries" property when it is possible do ## Test we use the "Entries" property when it is possible do
## dump values correctly. ## dump values correctly.
# RUN: yaml2obj --docnum=1 -D BITS=32 -D ENCODE=LSB %s -o %t.32le # RUN: yaml2obj --docnum=1 -D BITS=32 -D ENCODE=LSB %s -o %t.32le
# RUN: obj2yaml %t.32le | FileCheck %s --check-prefix=ELF32LE # RUN: obj2yaml %t.32le | FileCheck %s --check-prefix=ELF32LE
# RUN: yaml2obj --docnum=1 -D BITS=32 -D ENCODE=MSB %s -o %t.32be # RUN: yaml2obj --docnum=1 -D BITS=32 -D ENCODE=MSB %s -o %t.32be
# RUN: obj2yaml %t.32be | FileCheck %s --check-prefix=ELF32BE # RUN: obj2yaml %t.32be | FileCheck %s --check-prefix=ELF32BE
# RUN: yaml2obj --docnum=1 -D BITS=64 -D ENCODE=LSB %s -o %t.64le # RUN: yaml2obj --docnum=1 -D BITS=64 -D ENCODE=LSB %s -o %t.64le
# RUN: obj2yaml %t.64le | FileCheck %s --check-prefix=ELF64LE # RUN: obj2yaml %t.64le | FileCheck %s --check-prefix=ELF64LE
# RUN: yaml2obj --docnum=1 -D BITS=64 -D ENCODE=MSB %s -o %t.64be # RUN: yaml2obj --docnum=1 -D BITS=64 -D ENCODE=MSB %s -o %t.64be
# RUN: obj2yaml %t.64be | FileCheck %s --check-prefix=ELF64BE # RUN: obj2yaml %t.64be | FileCheck %s --check-prefix=ELF64BE
# ELF64LE: Sections: # ELF64LE: Sections:
# ELF64LE-NEXT: - Name: .relr.dyn # ELF64LE-NEXT: - Name: .relr.dyn
# ELF64LE-NEXT: Type: SHT_RELR # ELF64LE-NEXT: Type: SHT_RELR
# ELF64LE-NEXT: EntSize: 0x0000000000000008 # ELF64LE-NEXT: EntSize: 0x0000000000000008
# ELF64LE-NEXT: Entries: [ 0x8877665544332211 ] # ELF64LE-NEXT: Entries: [ 0x8877665544332211 ]
# ELF32LE: Sections: # ELF32LE: Sections:
# ELF32LE-NEXT: - Name: .relr.dyn # ELF32LE-NEXT: - Name: .relr.dyn
# ELF32LE-NEXT: Type: SHT_RELR # ELF32LE-NEXT: Type: SHT_RELR
# ELF32LE-NEXT: EntSize: 0x0000000000000004 # ELF32LE-NEXT: EntSize: 0x0000000000000004
# ELF32LE-NEXT: Entries: [ 0x0000000044332211, 0x0000000088776655 ] # ELF32LE-NEXT: Entries: [ 0x0000000044332211, 0x0000000088776655 ]
# ELF64BE: Sections: # ELF64BE: Sections:
# ELF64BE-NEXT: - Name: .relr.dyn # ELF64BE-NEXT: - Name: .relr.dyn
# ELF64BE-NEXT: Type: SHT_RELR # ELF64BE-NEXT: Type: SHT_RELR
# ELF64BE-NEXT: EntSize: 0x0000000000000008 # ELF64BE-NEXT: EntSize: 0x0000000000000008
# ELF64BE-NEXT: Entries: [ 0x1122334455667788 ] # ELF64BE-NEXT: Entries: [ 0x1122334455667788 ]
# ELF32BE: Sections: # ELF32BE: Sections:
# ELF32BE-NEXT: - Name: .relr.dyn # ELF32BE-NEXT: - Name: .relr.dyn
# ELF32BE-NEXT: Type: SHT_RELR # ELF32BE-NEXT: Type: SHT_RELR
# ELF32BE-NEXT: EntSize: 0x0000000000000004 # ELF32BE-NEXT: EntSize: 0x0000000000000004
# ELF32BE-NEXT: Entries: [ 0x0000000011223344, 0x0000000055667788 ] # ELF32BE-NEXT: Entries: [ 0x0000000011223344, 0x0000000055667788 ]
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS[[BITS]] Class: ELFCLASS[[BITS]]
Data: ELFDATA2[[ENCODE]] Data: ELFDATA2[[ENCODE]]
Type: ET_DYN Type: ET_DYN
Machine: EM_X86_64 Machine: EM_X86_64
Sections: Sections:
- Name: .relr.dyn - Name: .relr.dyn
Type: SHT_RELR Type: SHT_RELR
Content: "1122334455667788" Content: "1122334455667788"
## Test we use the "Content" property when a SHT_RELR section is truncated. ## Test we use the "Content" property when a SHT_RELR section is truncated.
# RUN: yaml2obj --docnum=2 %s -o %t.content # RUN: yaml2obj --docnum=2 %s -o %t.content
# RUN: obj2yaml %t.content | FileCheck %s --check-prefix=CONTENT # RUN: obj2yaml %t.content | FileCheck %s --check-prefix=CONTENT
# CONTENT: - Name: .relr.dyn # CONTENT: - Name: .relr.dyn
# CONTENT-NEXT: Type: SHT_RELR # CONTENT-NEXT: Type: SHT_RELR
# CONTENT-NEXT: EntSize: 0x0000000000000008 # CONTENT-NEXT: EntSize: 0x0000000000000008
# CONTENT-NEXT: Content: '11223344556677' # CONTENT-NEXT: Content: '11223344556677'
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2MSB Data: ELFDATA2MSB
Type: ET_DYN Type: ET_DYN
Machine: EM_X86_64 Machine: EM_X86_64
Sections: Sections:
- Name: .relr.dyn - Name: .relr.dyn
Type: SHT_RELR Type: SHT_RELR
Content: "11223344556677" Content: "11223344556677"
## Test we are able to dump a SHT_RELR section when sh_entsize is invalid.
jhendersonUnsubmitted
Done
ReplyInline Actions

"dump a SHT_RELR" (or possibly "dump an SHT_RELR" - I'm not sure what the English grammar rules are here!)

jhenderson: "dump a SHT_RELR" (or possibly "dump an SHT_RELR" - I'm not sure what the English grammar rules…
## Here we use 0xFE as a value instead of expected 0x8.
# RUN: yaml2obj --docnum=3 %s -o %t.entsize
# RUN: obj2yaml %t.entsize | FileCheck %s --check-prefix=ENTSIZE
# ENTSIZE: - Name: .relr.dyn
# ENTSIZE-NEXT: Type: SHT_RELR
# ENTSIZE-NEXT: EntSize: 0x00000000000000FE
# ENTSIZE-NEXT: Content: '1122334455667788'
# ENTSIZE-NEXT: ...
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2MSB
Type: ET_DYN
Machine: EM_X86_64
Sections:
- Name: .relr.dyn
Type: SHT_RELR
EntSize: 0xFE
Content: "1122334455667788"