diff --git a/llvm/lib/InterfaceStub/ELFObjHandler.cpp b/llvm/lib/InterfaceStub/ELFObjHandler.cpp --- a/llvm/lib/InterfaceStub/ELFObjHandler.cpp +++ b/llvm/lib/InterfaceStub/ELFObjHandler.cpp @@ -226,6 +226,7 @@ // Poplulate dynamic table. size_t DynSymIndex = DynTab.Content.addAddr(DT_SYMTAB, 0); size_t DynStrIndex = DynTab.Content.addAddr(DT_STRTAB, 0); + DynTab.Content.addValue(DT_STRSZ, DynSym.Size); for (const std::string &Lib : Stub.NeededLibs) DynTab.Content.addValue(DT_NEEDED, DynStr.Content.getOffset(Lib)); if (Stub.SoName) @@ -501,6 +502,72 @@ return Error::success(); } +/// Returns the StringRef to the DynStr from an ElfFile +/// @param ElfFile Reference to the ELFFile object. +/// @param DynEnt Reference to the DynamicEntries object. +template +static Expected getDynStr(const ELFFile &ElfFile, + const DynamicEntries &DynEnt) { + using Elf_Shdr_Range = typename ELFT::ShdrRange; + using Elf_Shdr = typename ELFT::Shdr; + + // Read offset from section headers. + Expected Shdrs = ElfFile.sections(); + if (!Shdrs) { + return Shdrs.takeError(); + } + if (Shdrs.get().size()) { + for (const Elf_Shdr &Sec : *Shdrs) { + if (Sec.sh_type == ELF::SHT_DYNSYM) { + // If multiple .dynsym presents, uses the first one. + // This behavior aligns with llvm::object::ELFFile::getDynSymtabSize() + return ElfFile.getStringTableForSymtab(Sec, *Shdrs); + } + } + return createError(".dynsym cannot be found in section headers"); + } + // Fallback to use offsets from .dynamic as there is no section header + // present. + Expected DynStrPtr = ElfFile.toMappedAddr(DynEnt.StrTabAddr); + if (!DynStrPtr) + return appendToError(DynStrPtr.takeError(), + "when locating .dynstr section contents"); + return StringRef(reinterpret_cast(*DynStrPtr), DynEnt.StrSize); +} + +/// Returns the in-memory pointer to the DynSym from an ElfFile +/// @param ElfFile Reference to the ELFFile object. +/// @param DynEnt Reference to the DynamicEntries object. +template +static Expected getDynSymPtr(const ELFFile &ElfFile, + const DynamicEntries &DynEnt) { + using Elf_Shdr_Range = typename ELFT::ShdrRange; + using Elf_Shdr = typename ELFT::Shdr; + + Expected Shdrs = ElfFile.sections(); + if (!Shdrs) { + return Shdrs.takeError(); + } + if (Shdrs.get().size()) { + for (const Elf_Shdr &Sec : *Shdrs) { + if (Sec.sh_type == ELF::SHT_DYNSYM) { + // If multiple .dynsym presents, uses the first one. + // This behavior aligns with llvm::object::ELFFile::getDynSymtabSize() + return ElfFile.base() + Sec.sh_offset; + } + } + return createError(".dynsym cannot be found in section headers"); + } + // Fallback to use offsets from .dynamic as there is no section header + // present. + Expected EDynSymPtr = + ElfFile.toMappedAddr(DynEnt.DynSymAddr); + if (!EDynSymPtr) + return appendToError(EDynSymPtr.takeError(), + "when locating .dynsym section contents"); + return EDynSymPtr.get(); +} + /// Returns a new IFSStub with all members populated from an ELFObjectFile. /// @param ElfObj Source ELFObjectFile. template @@ -508,6 +575,7 @@ buildStub(const ELFObjectFile &ElfObj) { using Elf_Dyn_Range = typename ELFT::DynRange; using Elf_Phdr_Range = typename ELFT::PhdrRange; + using Elf_Shdr_Range = typename ELFT::ShdrRange; using Elf_Sym_Range = typename ELFT::SymRange; using Elf_Sym = typename ELFT::Sym; std::unique_ptr DestStub = std::make_unique(); @@ -518,25 +586,16 @@ return DynTable.takeError(); } - // Fetch program headers. - Expected PHdrs = ElfFile.program_headers(); - if (!PHdrs) { - return PHdrs.takeError(); - } - // Collect relevant .dynamic entries. DynamicEntries DynEnt; if (Error Err = populateDynamic(DynEnt, *DynTable)) return std::move(Err); - // Get pointer to in-memory location of .dynstr section. - Expected DynStrPtr = ElfFile.toMappedAddr(DynEnt.StrTabAddr); - if (!DynStrPtr) - return appendToError(DynStrPtr.takeError(), - "when locating .dynstr section contents"); - - StringRef DynStr(reinterpret_cast(DynStrPtr.get()), - DynEnt.StrSize); + Expected EDynStr = getDynStr(ElfFile, DynEnt); + if (!EDynStr) { + return EDynStr.takeError(); + } + StringRef DynStr = EDynStr.get(); // Populate Arch from ELF header. DestStub->Target.Arch = static_cast(ElfFile.getHeader().e_machine); @@ -572,8 +631,7 @@ return SymCount.takeError(); if (*SymCount > 0) { // Get pointer to in-memory location of .dynsym section. - Expected DynSymPtr = - ElfFile.toMappedAddr(DynEnt.DynSymAddr); + Expected DynSymPtr = getDynSymPtr(ElfFile, DynEnt); if (!DynSymPtr) return appendToError(DynSymPtr.takeError(), "when locating .dynsym section contents"); diff --git a/llvm/test/tools/llvm-ifs/binary-read-add-soname.test b/llvm/test/tools/llvm-ifs/binary-read-add-soname.test --- a/llvm/test/tools/llvm-ifs/binary-read-add-soname.test +++ b/llvm/test/tools/llvm-ifs/binary-read-add-soname.test @@ -13,6 +13,8 @@ Flags: [ SHF_ALLOC ] Address: 0x0000 Content: "00" + - Name: .dynsym + Type: SHT_DYNSYM - Name: .dynamic Type: SHT_DYNAMIC Flags: [ SHF_ALLOC ] diff --git a/llvm/test/tools/llvm-ifs/binary-read-arch.test b/llvm/test/tools/llvm-ifs/binary-read-arch.test --- a/llvm/test/tools/llvm-ifs/binary-read-arch.test +++ b/llvm/test/tools/llvm-ifs/binary-read-arch.test @@ -14,6 +14,8 @@ Flags: [ SHF_ALLOC ] Address: 0x0000 Content: "00" + - Name: .dynsym + Type: SHT_DYNSYM - Name: .dynamic Type: SHT_DYNAMIC Flags: [ SHF_ALLOC ] @@ -66,6 +68,8 @@ Flags: [ SHF_ALLOC ] Address: 0x0000 Content: "00" + - Name: .dynsym + Type: SHT_DYNSYM - Name: .dynamic Type: SHT_DYNAMIC Flags: [ SHF_ALLOC ] @@ -110,6 +114,8 @@ Flags: [ SHF_ALLOC ] Address: 0x0000 Content: "00" + - Name: .dynsym + Type: SHT_DYNSYM - Name: .dynamic Type: SHT_DYNAMIC Flags: [ SHF_ALLOC ] diff --git a/llvm/test/tools/llvm-ifs/binary-read-neededlibs.test b/llvm/test/tools/llvm-ifs/binary-read-neededlibs.test --- a/llvm/test/tools/llvm-ifs/binary-read-neededlibs.test +++ b/llvm/test/tools/llvm-ifs/binary-read-neededlibs.test @@ -14,6 +14,8 @@ Address: 0x1000 # "\0libfoo.so\0libbar.so\0somelib.so\0foo\0" Content: "006c6962666f6f2e736f006c69626261722e736f00736f6d656c69622e736f00666f6f00" + - Name: .dynsym + Type: SHT_DYNSYM - Name: .dynamic Type: SHT_DYNAMIC Flags: [ SHF_ALLOC ] diff --git a/llvm/test/tools/llvm-ifs/binary-read-replace-soname.test b/llvm/test/tools/llvm-ifs/binary-read-replace-soname.test --- a/llvm/test/tools/llvm-ifs/binary-read-replace-soname.test +++ b/llvm/test/tools/llvm-ifs/binary-read-replace-soname.test @@ -15,6 +15,8 @@ Address: 0x1000 # \0 b a z\0 s o m e l i b . s o\0 f o o\0 Content: "0062617a00736f6d656c69622e736f00666f6f00" + - Name: .dynsym + Type: SHT_DYNSYM - Name: .dynamic Type: SHT_DYNAMIC Flags: [ SHF_ALLOC ] diff --git a/llvm/test/tools/llvm-ifs/binary-read-soname-no-null.test b/llvm/test/tools/llvm-ifs/binary-read-soname-no-null.test --- a/llvm/test/tools/llvm-ifs/binary-read-soname-no-null.test +++ b/llvm/test/tools/llvm-ifs/binary-read-soname-no-null.test @@ -14,6 +14,8 @@ Address: 0x1000 # \0 b a z\0 s o m e l i b . s o z z z Content: "0062617a00736f6d656c69622e736f7a7a7a" + - Name: .dynsym + Type: SHT_DYNSYM - Name: .dynamic Type: SHT_DYNAMIC Flags: [ SHF_ALLOC ] @@ -45,4 +47,4 @@ FirstSec: .dynamic LastSec: .dynamic -# CHECK: String overran bounds of string table (no null terminator) when reading DT_SONAME +# CHECK: SHT_STRTAB string table section [index 1] is non-null terminated diff --git a/llvm/test/tools/llvm-ifs/binary-read-soname.test b/llvm/test/tools/llvm-ifs/binary-read-soname.test --- a/llvm/test/tools/llvm-ifs/binary-read-soname.test +++ b/llvm/test/tools/llvm-ifs/binary-read-soname.test @@ -14,6 +14,8 @@ Address: 0x1000 # \0 b a z\0 s o m e l i b . s o\0 f o o\0 Content: "0062617a00736f6d656c69622e736f00666f6f00" + - Name: .dynsym + Type: SHT_DYNSYM - Name: .dynamic Type: SHT_DYNAMIC Flags: [ SHF_ALLOC ] diff --git a/llvm/test/tools/llvm-ifs/ifs-elf-conversion.test b/llvm/test/tools/llvm-ifs/ifs-elf-conversion.test new file mode 100644 --- /dev/null +++ b/llvm/test/tools/llvm-ifs/ifs-elf-conversion.test @@ -0,0 +1,25 @@ +## Test writing stub ELF from IFS and read stub ELF to regenerate IFS. + +# RUN: llvm-ifs --output-elf=%t.elf64l --arch=x86_64 --bitwidth=64 --endianness=little %s + +# RUN: llvm-ifs --output-ifs=- --strip-ifs-target %t.elf64l | FileCheck %s + +--- !ifs-v1 +IfsVersion: 3.0 +NeededLibs: + - libc.so.6 +Symbols: + - { Name: bar, Type: Object, Size: 42 } + - { Name: baz, Type: TLS, Size: 3 } + - { Name: plus, Type: Func } +... + +# CHECK: --- !ifs-v1 +# CHECK-NEXT: IfsVersion: 3.0 +# CHECK-NEXT: NeededLibs: +# CHECK-NEXT: - libc.so.6 +# CHECK-NEXT: Symbols: +# CHECK-NEXT: - { Name: bar, Type: Object, Size: 42 } +# CHECK-NEXT: - { Name: baz, Type: TLS, Size: 3 } +# CHECK-NEXT: - { Name: plus, Type: Func } +# CHECK-NEXT: ... diff --git a/llvm/test/tools/llvm-ifs/write-stub.test b/llvm/test/tools/llvm-ifs/write-stub.test --- a/llvm/test/tools/llvm-ifs/write-stub.test +++ b/llvm/test/tools/llvm-ifs/write-stub.test @@ -142,10 +142,11 @@ # CHECK-NEXT: EntrySize: 0 # CHECK-NEXT: } -# CHECK: DynamicSection [ (4 entries) +# CHECK: DynamicSection [ (5 entries) # CHECK-NEXT: Tag Type Name/Value # CHECK-NEXT: 0x[[DYNTABZ]]0000006 SYMTAB # CHECK-NEXT: 0x[[DYNTABZ]]0000005 STRTAB +# CHECK-NEXT: 0x[[DYNTABZ]]000000A STRSZ # CHECK-NEXT: 0x[[DYNTABZ]]0000001 NEEDED Shared library: [libc.so.6] # CHECK-NEXT: 0x[[DYNTABZ]]0000000 NULL # CHECK-NEXT: ]