From 3fa933970699aa56b837fd7e048438c518bab8f4 Mon Sep 17 00:00:00 2001 From: James Henderson Date: Mon, 25 Feb 2019 11:02:24 +0000 Subject: [PATCH] [yaml2obj]Re-allow dynamic sections to have raw content Recently, support was added to yaml2obj to allow dynamic sections to have a list of entries, to make it easier to write tests with dynamic sections. However, this change also removed the ability to provide custom contents to the dynamic section, making it hard to test malformed contents (e.g. because the section is not a valid size to contain an array of entries). This change reinstates this. An error is emitted if raw content and dynamic entries are both specified. Reviewed by: grimar, ruiu Differential Review: https://reviews.llvm.org/D58543 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@354770 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ObjectYAML/ELFYAML.h | 1 + lib/ObjectYAML/ELFYAML.cpp | 1 + .../yaml2obj/dynamic-section-raw-content.yaml | 44 +++++++++++++++++++ tools/yaml2obj/yaml2elf.cpp | 24 ++++++++-- 4 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 test/tools/yaml2obj/dynamic-section-raw-content.yaml diff --git a/include/llvm/ObjectYAML/ELFYAML.h b/include/llvm/ObjectYAML/ELFYAML.h index c7f517a4b65..91c37ece0d8 100644 --- a/include/llvm/ObjectYAML/ELFYAML.h +++ b/include/llvm/ObjectYAML/ELFYAML.h @@ -141,6 +141,7 @@ struct Section { struct DynamicSection : Section { std::vector Entries; + Optional Content; DynamicSection() : Section(SectionKind::Dynamic) {} diff --git a/lib/ObjectYAML/ELFYAML.cpp b/lib/ObjectYAML/ELFYAML.cpp index e51454cb759..b2b69d5c30e 100644 --- a/lib/ObjectYAML/ELFYAML.cpp +++ b/lib/ObjectYAML/ELFYAML.cpp @@ -855,6 +855,7 @@ static void commonSectionMapping(IO &IO, ELFYAML::Section &Section) { static void sectionMapping(IO &IO, ELFYAML::DynamicSection &Section) { commonSectionMapping(IO, Section); IO.mapOptional("Entries", Section.Entries); + IO.mapOptional("Content", Section.Content); } static void sectionMapping(IO &IO, ELFYAML::RawContentSection &Section) { diff --git a/test/tools/yaml2obj/dynamic-section-raw-content.yaml b/test/tools/yaml2obj/dynamic-section-raw-content.yaml new file mode 100644 index 00000000000..37af06755a9 --- /dev/null +++ b/test/tools/yaml2obj/dynamic-section-raw-content.yaml @@ -0,0 +1,44 @@ +# Show that yaml2obj can handle a dynamic section with raw content instead of +# entries. Also show that it rejects raw content when entries are also provided. + +# RUN: yaml2obj --docnum=1 %s -o %t1 +# RUN: llvm-readobj -x .dynamic --sections %t1 | FileCheck %s --check-prefix=RAW + +# RAW: Name: .dynamic +# RAW-NEXT: Type: SHT_DYNAMIC +# RAW-NEXT: Flags [ +# RAW-NEXT: ] +# RAW-NEXT: Address: +# RAW-NEXT: Offset: +# RAW-NEXT: Size: 5 + +# RAW: Hex dump of section '.dynamic': +# RAW-NEXT: 0x00000000 01234567 89 {{.*}} + +# RUN: not yaml2obj --docnum=2 %s -o %t2 2>&1 | FileCheck %s --check-prefix=ERR +# ERR: Cannot specify both raw content and explicit entries for dynamic section '.dynamic'. + +--- !ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC + Machine: EM_X86_64 +Sections: + - Name: .dynamic + Type: SHT_DYNAMIC + Content: "0123456789" + +--- !ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC + Machine: EM_X86_64 +Sections: + - Name: .dynamic + Type: SHT_DYNAMIC + Content: "0123456789" + Entries: + - Tag: DT_STRSZ + Value: 0 diff --git a/tools/yaml2obj/yaml2elf.cpp b/tools/yaml2obj/yaml2elf.cpp index 351b7347653..d651c92dd65 100644 --- a/tools/yaml2obj/yaml2elf.cpp +++ b/tools/yaml2obj/yaml2elf.cpp @@ -169,7 +169,7 @@ class ELFState { bool writeSectionContent(Elf_Shdr &SHeader, const ELFYAML::MipsABIFlags &Section, ContiguousBlobAccumulator &CBA); - void writeSectionContent(Elf_Shdr &SHeader, + bool writeSectionContent(Elf_Shdr &SHeader, const ELFYAML::DynamicSection &Section, ContiguousBlobAccumulator &CBA); bool hasDynamicSymbols() const; @@ -309,7 +309,8 @@ bool ELFState::initSectionHeaders(std::vector &SHeaders, // so just to setup the section offset. CBA.getOSAndAlignedOffset(SHeader.sh_offset, SHeader.sh_addralign); } else if (auto S = dyn_cast(Sec.get())) { - writeSectionContent(SHeader, *S, CBA); + if (!writeSectionContent(SHeader, *S, CBA)) + return false; } else if (auto S = dyn_cast(Sec.get())) { writeSectionContent(SHeader, *S, CBA); } else if (auto S = dyn_cast(Sec.get())) { @@ -713,7 +714,7 @@ bool ELFState::writeSectionContent(Elf_Shdr &SHeader, } template -void ELFState::writeSectionContent(Elf_Shdr &SHeader, +bool ELFState::writeSectionContent(Elf_Shdr &SHeader, const ELFYAML::DynamicSection &Section, ContiguousBlobAccumulator &CBA) { typedef typename ELFT::uint uintX_t; @@ -721,7 +722,18 @@ void ELFState::writeSectionContent(Elf_Shdr &SHeader, assert(Section.Type == llvm::ELF::SHT_DYNAMIC && "Section type is not SHT_DYNAMIC"); - SHeader.sh_size = 2 * sizeof(uintX_t) * Section.Entries.size(); + if (!Section.Entries.empty() && Section.Content) { + WithColor::error() + << "Cannot specify both raw content and explicit entries " + "for dynamic section '" + << Section.Name << "'.\n"; + return false; + } + + if (Section.Content) + SHeader.sh_size = Section.Content->binary_size(); + else + SHeader.sh_size = 2 * sizeof(uintX_t) * Section.Entries.size(); if (Section.EntSize) SHeader.sh_entsize = *Section.EntSize; else @@ -732,6 +744,10 @@ void ELFState::writeSectionContent(Elf_Shdr &SHeader, support::endian::write(OS, DE.Tag, ELFT::TargetEndianness); support::endian::write(OS, DE.Val, ELFT::TargetEndianness); } + if (Section.Content) + Section.Content->writeAsBinary(OS); + + return true; } template bool ELFState::buildSectionIndex() { -- 2.40.0