This is an archive of the discontinued LLVM Phabricator instance.

Differential D14451

[ELF2] - Fixed crash for case when section sh_entsize is set to zero for SHF_MERGE type of sections.
ClosedPublic

Authored by grimar on Nov 6 2015, 9:01 AM.

Details

Reviewers
ruiu
• rafael
Commits
rG564da7ee8733: [ELF2] - Fixed crash for case when section sh_entsize is set to zero for…
rLLD252454: [ELF2] - Fixed crash for case when section sh_entsize is set to zero for…
rL252454: [ELF2] - Fixed crash for case when section sh_entsize is set to zero for…
Summary

Fixed crash for incorrect elf input, bfd does not crash btw.

Diff Detail

Event Timeline

grimar updated this revision to Diff 39546.Nov 6 2015, 9:01 AM
grimar retitled this revision from to [ELF2] - Fixed crash for case when section sh_entsize is set to zero for SHF_MERGE type of sections..
grimar updated this object.
grimar added reviewers: ruiu, • rafael.
grimar added subscribers: llvm-commits, grimar.
• rafael edited edge metadata.Nov 6 2015, 1:14 PM
• rafael added a subscriber: • rafael.

LGTM

Closed by commit rL252454: [ELF2] - Fixed crash for case when section sh_entsize is set to zero for… (authored by grimar). · Explain WhyNov 9 2015, 12:43 AM
This revision was automatically updated to reflect the committed changes.
ruiu edited edge metadata.Nov 9 2015, 12:14 PM

LGTM

Revision Contents

PathSize
ELF/
2 lines
test/
elf2/
Inputs/
4 lines

Diff 39546

ELF/InputFiles.cpp

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Lines
static bool shouldMerge(const typename ELFFile<ELFT>::Elf_Shdr &Sec) { static bool shouldMerge(const typename ELFFile<ELFT>::Elf_Shdr &Sec) {
typedef typename ELFFile<ELFT>::uintX_t uintX_t; typedef typename ELFFile<ELFT>::uintX_t uintX_t;
uintX_t Flags = Sec.sh_flags; uintX_t Flags = Sec.sh_flags;
if (!(Flags & SHF_MERGE)) if (!(Flags & SHF_MERGE))
return false; return false;
if (Flags & SHF_WRITE) if (Flags & SHF_WRITE)
error("Writable SHF_MERGE sections are not supported"); error("Writable SHF_MERGE sections are not supported");
uintX_t EntSize = Sec.sh_entsize; uintX_t EntSize = Sec.sh_entsize;
if (Sec.sh_size % EntSize) if (!EntSize || Sec.sh_size % EntSize)
error("SHF_MERGE section size must be a multiple of sh_entsize"); error("SHF_MERGE section size must be a multiple of sh_entsize");
// Don't try to merge if the aligment is larger than the sh_entsize. // Don't try to merge if the aligment is larger than the sh_entsize.
// //
// If this is not a SHF_STRINGS, we would need to pad after every entity. It // If this is not a SHF_STRINGS, we would need to pad after every entity. It
// would be equivalent for the producer of the .o to just set a larger // would be equivalent for the producer of the .o to just set a larger
// sh_entsize. // sh_entsize.
// //
▲ Show 20 Lines • Show All 304 Lines • Show Last 20 Lines

test/elf2/Inputs/invalid-shentsize-zero.elf

  • This is a binary file.
PropertyOld ValueNew Value
svn:mime-typenullapplication/octet-stream
\ No newline at end of property

test/elf2/invalid-elf.test

Show All 17 Lines
# RUN: not ld.lld2 %p/Inputs/invalid-section-index.elf -o %t2 2>&1 | \ # RUN: not ld.lld2 %p/Inputs/invalid-section-index.elf -o %t2 2>&1 | \
# RUN: FileCheck --check-prefix=INVALID-SECTION-INDEX %s # RUN: FileCheck --check-prefix=INVALID-SECTION-INDEX %s
# INVALID-SECTION-INDEX: Invalid section index # INVALID-SECTION-INDEX: Invalid section index
# RUN: not ld.lld2 %p/Inputs/invalid-shstrndx.so -o %t2 2>&1 | \ # RUN: not ld.lld2 %p/Inputs/invalid-shstrndx.so -o %t2 2>&1 | \
# RUN: FileCheck --check-prefix=INVALID-SECTION-INDEX %s # RUN: FileCheck --check-prefix=INVALID-SECTION-INDEX %s
# RUN: not ld.lld2 %p/Inputs/invalid-shentsize-zero.elf -o %t2 2>&1 | \
# RUN: FileCheck --check-prefix=INVALID-SHENTSIZE-ZERO %s
# INVALID-SHENTSIZE-ZERO: SHF_MERGE section size must be a multiple of sh_entsize
.long foo .long foo