diff options
| author | Christopher Ferris <cferris@google.com> | 2023-11-29 16:28:23 -0800 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2023-11-30 13:08:04 -0600 |
| commit | b6d1d9068c41a0dec960f723b66555c0d96e1535 (patch) | |
| tree | 88cc5837d85c93090ea110e24c1928cd77fdf793 | |
| parent | bf51dae965ff237007377edd93d44c4c682a7d26 (diff) | |
| download | toybox-b6d1d9068c41a0dec960f723b66555c0d96e1535.tar.gz | |
readelf: Fix the section flags handling.
The array of section flags was missing the G flag, so any flags
after it were displayed incorrectly. And, of course, the G flag
was not displayed at all.
Added a new elf file with a section that include the T and C flags
and updated readelf.test to run this test. This test fails on the
old code and passes with the fix.
| -rwxr-xr-x | tests/files/elf/ndk-elf-note-shflags | bin | 0 -> 4308 bytes | |||
| -rwxr-xr-x | tests/readelf.test | 36 | ||||
| -rw-r--r-- | toys/other/readelf.c | 2 |
3 files changed, 37 insertions, 1 deletions
diff --git a/tests/files/elf/ndk-elf-note-shflags b/tests/files/elf/ndk-elf-note-shflags Binary files differnew file mode 100755 index 00000000..684a78bf --- /dev/null +++ b/tests/files/elf/ndk-elf-note-shflags diff --git a/tests/readelf.test b/tests/readelf.test index 1e85e45e..2f0a4712 100755 --- a/tests/readelf.test +++ b/tests/readelf.test @@ -70,6 +70,42 @@ Section Headers: [31] .strtab STRTAB 0000000000000000 001b18 0001f4 00 0 0 1 " "" "" +# Verify many section header flags display properly. +NOSPACE=1 testing "-S flags" "readelf -SW $elf-shflags | head -32" \ +"There are 28 section headers, starting at offset 0xc74: + +Section Headers: + [Nr] Name Type Address Off Size ES Flg Lk Inf Al + [ 0] NULL 00000000 000000 000000 00 0 0 0 + [ 1] .interp PROGBITS 000001b4 0001b4 000013 00 A 0 0 1 + [ 2] .note.android.ident NOTE 000001c8 0001c8 000018 00 A 0 0 4 + [ 3] .note.gnu.build-id NOTE 000001e0 0001e0 000020 00 A 0 0 4 + [ 4] .dynsym DYNSYM 00000200 000200 000060 10 A 8 1 4 + [ 5] .gnu.version VERSYM 00000260 000260 00000c 02 A 4 0 2 + [ 6] .gnu.version_r VERNEED 0000026c 00026c 000020 00 A 8 1 4 + [ 7] .gnu.hash GNU_HASH 0000028c 00028c 000018 00 A 4 0 4 + [ 8] .dynstr STRTAB 000002a4 0002a4 000064 00 A 0 0 1 + [ 9] .rel.dyn ANDROID_REL 00000308 000308 00000d 01 A 4 0 4 + [10] .relr.dyn RELR 00000318 000318 00000c 04 A 0 0 4 + [11] .ARM.exidx ARM_EXIDX 00000324 000324 000028 00 AL 14 0 4 + [12] .rel.plt REL 0000034c 00034c 000020 08 AI 4 19 4 + [13] .rodata PROGBITS 0000036c 00036c 000015 01 AMS 0 0 1 + [14] .text PROGBITS 00001384 000384 0001c4 00 AX 0 0 4 + [15] .plt PROGBITS 00001550 000550 000060 00 AX 0 0 16 + [16] .tdata PROGBITS 000025c0 0005c0 000000 00 WAT 0 0 32 + [17] .dynamic DYNAMIC 000025c0 0005c0 0000d0 08 WA 8 0 4 + [18] .got PROGBITS 00002690 000690 000010 00 WA 0 0 4 + [19] .got.plt PROGBITS 000026a0 0006a0 00001c 00 WA 0 0 4 + [20] .data PROGBITS 000036bc 0006bc 00000c 00 WA 0 0 4 + [21] .comment PROGBITS 00000000 0006c8 0000cc 01 MS 0 0 1 + [22] .ARM.attributes ATTRIBUTES 00000000 000794 000042 00 0 0 1 + [23] .debug_frame PROGBITS 00000000 0007d8 00007a 00 C 0 0 4 + [24] .symtab SYMTAB 00000000 000854 000220 10 26 27 4 + [25] .shstrtab STRTAB 00000000 000a74 00010e 00 0 0 1 + [26] .strtab STRTAB 00000000 000b82 0000de 00 0 0 1 + [27] .gnu_debuglink PROGBITS 00000000 000c60 000014 00 0 0 4 +" "" "" + testing "-l" "readelf -lW $elf-short" " Elf file type is DYN (Shared object file) Entry point 0x1001 diff --git a/toys/other/readelf.c b/toys/other/readelf.c index 6aaa55e1..15e5e7d7 100644 --- a/toys/other/readelf.c +++ b/toys/other/readelf.c @@ -542,7 +542,7 @@ static void scan_elf() if (FLAG(S)) { char sh_flags[12] = {}, *p = sh_flags; - for (j=0; j<12; j++) if (s.flags&(1<<j)) *p++ = "WAXxMSILOTC"[j]; + for (j=0; j<12; j++) if (s.flags&(1<<j)) *p++ = "WAXxMSILOGTC"[j]; printf(" [%2d] %-17s %-15s %0*llx %06llx %06llx %02llx %3s %2d %2d %2lld\n", i, s.name, sh_type(s.type), w, s.addr, s.offset, s.size, s.entsize, sh_flags, s.link, s.info, s.addralign); |