Skip to content
This repository was archived by the owner on Mar 28, 2020. It is now read-only.

Commit bf34add

Browse files
committed
[obj2yaml] Produce correct output for invalid relocations.
R_X86_64_NONE can be emitted without a symbol associated (well, in theory it should never be emitted in an ABI-compliant relocatable object). So, if there's no symbol associated to a reloc, emit one with an empty name, instead of crashing. Ack'ed by Michael Spencer offline. PR: 31768 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@293224 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent f7b66eb commit bf34add

File tree

3 files changed

+49
-4
lines changed

3 files changed

+49
-4
lines changed
624 Bytes
Binary file not shown.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
RUN: obj2yaml %p/Inputs/invalid-reloc.elf-x86-64 | FileCheck %s
2+
3+
CHECK: --- !ELF
4+
CHECK-NEXT: FileHeader:
5+
CHECK-NEXT: Class: ELFCLASS64
6+
CHECK-NEXT: Data: ELFDATA2LSB
7+
CHECK-NEXT: OSABI: ELFOSABI_FREEBSD
8+
CHECK-NEXT: Type: ET_REL
9+
CHECK-NEXT: Machine: EM_X86_64
10+
CHECK-NEXT: Sections:
11+
CHECK-NEXT: - Name: .text
12+
CHECK-NEXT: Type: SHT_PROGBITS
13+
CHECK-NEXT: Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
14+
CHECK-NEXT: AddressAlign: 0x0000000000000004
15+
CHECK-NEXT: Content: 4833C0C390
16+
CHECK-NEXT: - Name: .rela.text
17+
CHECK-NEXT: Type: SHT_RELA
18+
CHECK-NEXT: Link: .symtab
19+
CHECK-NEXT: AddressAlign: 0x0000000000000008
20+
CHECK-NEXT: Info: .text
21+
CHECK-NEXT: Relocations:
22+
CHECK-NEXT: - Offset: 0x0000000000000000
23+
CHECK-NEXT: Symbol: ''
24+
CHECK-NEXT: Type: R_X86_64_NONE
25+
CHECK-NEXT: Symbols:
26+
CHECK-NEXT: Local:
27+
CHECK-NEXT: - Name: rb_ary_new_capa
28+
CHECK-NEXT: Type: STT_FUNC
29+
CHECK-NEXT: Section: .text
30+
CHECK-NEXT: Size: 0x0000000000000005
31+
CHECK-NEXT: Global:
32+
CHECK-NEXT: - Name: __dtraceenabled_ruby___array-create
33+
CHECK-NEXT: - Name: '$dtrace1316529.rb_ary_new_capa'
34+
CHECK-NEXT: Type: STT_FUNC
35+
CHECK-NEXT: Section: .text
36+
CHECK-NEXT: Size: 0x0000000000000005
37+
CHECK-NEXT: Visibility: STV_HIDDEN

tools/obj2yaml/elf2yaml.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,18 @@ std::error_code ELFDumper<ELFT>::dumpRelocation(const RelT *Rel,
228228
return errorToErrorCode(StrTabOrErr.takeError());
229229
StringRef StrTab = *StrTabOrErr;
230230

231-
Expected<StringRef> NameOrErr = Sym->getName(StrTab);
232-
if (!NameOrErr)
233-
return errorToErrorCode(NameOrErr.takeError());
234-
R.Symbol = NameOrErr.get();
231+
if (Sym) {
232+
Expected<StringRef> NameOrErr = Sym->getName(StrTab);
233+
if (!NameOrErr)
234+
return errorToErrorCode(NameOrErr.takeError());
235+
R.Symbol = NameOrErr.get();
236+
} else {
237+
// We have some edge cases of relocations without a symbol associated,
238+
// e.g. an object containing the invalid (according to the System V
239+
// ABI) R_X86_64_NONE reloc. Create a symbol with an empty name instead
240+
// of crashing.
241+
R.Symbol = "";
242+
}
235243

236244
return obj2yaml_error::success;
237245
}

0 commit comments

Comments
 (0)