Skip to content

Commit 0054c46

Browse files
committed
[llvm-nm/objdump/size] Add tests for dumping symbol tables with invalid sh_size.
This change adds tests for llvm-nm, llvm-objdump and llvm-size when dumping symbol tables with invalid sh_size (sh_size % sizeof(Elf_Sym) != 0). Reviewed By: jhenderson, MaskRay Differential Revision: https://reviews.llvm.org/D77864
1 parent d782d1f commit 0054c46

File tree

5 files changed

+91
-2
lines changed

5 files changed

+91
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
## This test ensures llvm-nm emits a helpful error message when dumping a symbol table
2+
## whose sh_size isn't a multiple of the symbol size (sh_size % sizeof(Elf_Sym) != 0).
3+
4+
## a) Broken .symtab symbol table. Valid .dynsym symbol table.
5+
# RUN: yaml2obj -DBITS=32 -DSIZE=33 -DDYNSIZE=32 %s -o %t.32-bit.o
6+
# RUN: not llvm-nm %t.32-bit.o 2>&1 | FileCheck -DSIZE=33 -DSYMSIZE=16 -DINDEX=2 %s
7+
# RUN: yaml2obj -DBITS=64 -DSIZE=49 -DDYNSIZE=48 %s -o %t.64-bit.o
8+
# RUN: not llvm-nm %t.64-bit.o 2>&1 | FileCheck -DSIZE=49 -DSYMSIZE=24 -DINDEX=2 %s
9+
10+
## b) Broken .dynsym symbol table. Valid .symtab symbol table.
11+
# RUN: yaml2obj -DBITS=32 -DSIZE=32 -DDYNSIZE=33 %s -o %t.32-bit.o
12+
# RUN: not llvm-nm --dynamic %t.32-bit.o 2>&1 | FileCheck -DSIZE=33 -DSYMSIZE=16 -DINDEX=3 %s
13+
# RUN: yaml2obj -DBITS=64 -DSIZE=48 -DDYNSIZE=49 %s -o %t.64-bit.o
14+
# RUN: not llvm-nm --dynamic %t.64-bit.o 2>&1 | FileCheck -DSIZE=49 -DSYMSIZE=24 -DINDEX=3 %s
15+
16+
# CHECK: error: {{.*}} section [index [[INDEX]]] has an invalid sh_size ([[SIZE]]) which is not a multiple of its sh_entsize ([[SYMSIZE]])
17+
18+
--- !ELF
19+
FileHeader:
20+
Class: ELFCLASS[[BITS]]
21+
Data: ELFDATA2LSB
22+
Type: ET_DYN
23+
Machine: EM_X86_64
24+
Sections:
25+
- Name: .dynstr
26+
Type: SHT_STRTAB
27+
Content: "00"
28+
- Name: .symtab
29+
Type: SHT_SYMTAB
30+
Size: [[SIZE]]
31+
- Name: .dynsym
32+
Type: SHT_DYNSYM
33+
Size: [[DYNSIZE]]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
## This test ensures llvm-objdump emits a helpful error message when dumping a symbol table
2+
## whose sh_size isn't a multiple of the symbol size (sh_size % sizeof(Elf_Sym) != 0).
3+
4+
## a) Broken .symtab symbol table. Valid .dynsym symbol table.
5+
# RUN: yaml2obj -DBITS=32 -DSIZE=33 -DDYNSIZE=32 %s -o %t.32-bit.o
6+
# RUN: not llvm-objdump --syms %t.32-bit.o 2>&1 | FileCheck -DSIZE=33 -DSYMSIZE=16 -DINDEX=2 %s
7+
# RUN: yaml2obj -DBITS=64 -DSIZE=49 -DDYNSIZE=48 %s -o %t.64-bit.o
8+
# RUN: not llvm-objdump --syms %t.64-bit.o 2>&1 | FileCheck -DSIZE=49 -DSYMSIZE=24 -DINDEX=2 %s
9+
10+
## b) Broken .dynsym symbol table. Valid .symtab symbol table.
11+
# RUN: yaml2obj -DBITS=32 -DSIZE=32 -DDYNSIZE=33 %s -o %t.32-bit.o
12+
# RUN: not llvm-objdump --dynamic-syms %t.32-bit.o 2>&1 | FileCheck -DSIZE=33 -DSYMSIZE=16 -DINDEX=3 %s
13+
# RUN: yaml2obj -DBITS=64 -DSIZE=48 -DDYNSIZE=49 %s -o %t.64-bit.o
14+
# RUN: not llvm-objdump --dynamic-syms %t.64-bit.o 2>&1 | FileCheck -DSIZE=49 -DSYMSIZE=24 -DINDEX=3 %s
15+
16+
# CHECK: error: {{.*}} section [index [[INDEX]]] has an invalid sh_size ([[SIZE]]) which is not a multiple of its sh_entsize ([[SYMSIZE]])
17+
18+
--- !ELF
19+
FileHeader:
20+
Class: ELFCLASS[[BITS]]
21+
Data: ELFDATA2LSB
22+
Type: ET_DYN
23+
Machine: EM_X86_64
24+
Sections:
25+
- Name: .dynstr
26+
Type: SHT_STRTAB
27+
Content: "00"
28+
- Name: .symtab
29+
Type: SHT_SYMTAB
30+
Size: [[SIZE]]
31+
- Name: .dynsym
32+
Type: SHT_DYNSYM
33+
Size: [[DYNSIZE]]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
## This test ensures llvm-size emits a helpful error message when dumping a symbol table
2+
## whose sh_size isn't a multiple of the symbol size (sh_size % sizeof(Elf_Sym) != 0).
3+
4+
## a) Test sysv output format.
5+
# RUN: yaml2obj -DBITS=32 -DSIZE=33 -DDYNSIZE=32 %s -o %t.32-bit.o
6+
# RUN: not llvm-size --common --format=sysv %t.32-bit.o 2>&1 | FileCheck -DSIZE=33 -DSYMSIZE=16 %s
7+
# RUN: yaml2obj -DBITS=64 -DSIZE=49 -DDYNSIZE=48 %s -o %t.64-bit.o
8+
# RUN: not llvm-size --common --format=sysv %t.64-bit.o 2>&1 | FileCheck -DSIZE=49 -DSYMSIZE=24 %s
9+
10+
## b) Test berkeley output format.
11+
# RUN: not llvm-size --common --format=berkeley %t.32-bit.o 2>&1 | FileCheck -DSIZE=33 -DSYMSIZE=16 %s
12+
# RUN: not llvm-size --common --format=berkeley %t.64-bit.o 2>&1 | FileCheck -DSIZE=49 -DSYMSIZE=24 %s
13+
14+
# CHECK: error: {{.*}} section [index 1] has an invalid sh_size ([[SIZE]]) which is not a multiple of its sh_entsize ([[SYMSIZE]])
15+
16+
--- !ELF
17+
FileHeader:
18+
Class: ELFCLASS[[BITS]]
19+
Data: ELFDATA2LSB
20+
Type: ET_DYN
21+
Machine: EM_X86_64
22+
Sections:
23+
- Name: .symtab
24+
Type: SHT_SYMTAB
25+
Size: [[SIZE]]

llvm/tools/llvm-nm/llvm-nm.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,6 @@ static void dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName,
12181218
for (BasicSymbolRef Sym : Symbols) {
12191219
Expected<uint32_t> SymFlagsOrErr = Sym.getFlags();
12201220
if (!SymFlagsOrErr) {
1221-
// TODO: Test this error.
12221221
error(SymFlagsOrErr.takeError(), Obj.getFileName());
12231222
return;
12241223
}

llvm/tools/llvm-size/llvm-size.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ static Expected<uint64_t> getCommonSize(ObjectFile *Obj) {
202202
Expected<uint32_t> SymFlagsOrErr =
203203
Obj->getSymbolFlags(Sym.getRawDataRefImpl());
204204
if (!SymFlagsOrErr)
205-
// TODO: Test this error.
206205
return SymFlagsOrErr.takeError();
207206
if (*SymFlagsOrErr & SymbolRef::SF_Common)
208207
TotalCommons += Obj->getCommonSymbolSize(Sym.getRawDataRefImpl());

0 commit comments

Comments
 (0)