mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-10-05 19:20:23 +08:00
Code Issues Releases Wiki Activity

Adapt to libbfd: "no Shdrs" requires 0==.e_shentsize and 0==.e_shnum

Browse Source 
modified:   p_lx_elf.cpp
This commit is contained in:
John Reiser 2022-10-23 11:14:07 -07:00 committed by Markus F.X.J. Oberhumer
parent c331b9f1e2
commit 2354b01bad
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/p_lx_elf.cpp
View File

@ -2889,14 +2889,18 @@ PackLinuxElf32::generateElfHdr(
h2->ehdr.e_shoff = 0; h2->ehdr.e_shoff = 0;
assert(get_te16(&h2->ehdr.e_ehsize) == sizeof(Elf32_Ehdr)); assert(get_te16(&h2->ehdr.e_ehsize) == sizeof(Elf32_Ehdr));
assert(get_te16(&h2->ehdr.e_phentsize) == sizeof(Elf32_Phdr)); assert(get_te16(&h2->ehdr.e_phentsize) == sizeof(Elf32_Phdr));
set_te16(&h2->ehdr.e_shentsize, sizeof(Elf32_Shdr));
if (o_elf_shnum) { if (o_elf_shnum) {
h2->ehdr.e_shnum = o_elf_shnum; set_te16(&h2->ehdr.e_shentsize, sizeof(Elf32_Shdr));
h2->ehdr.e_shstrndx = o_elf_shnum - 1; h2->ehdr.e_shnum = o_elf_shnum;
h2->ehdr.e_shstrndx = o_elf_shnum - 1;
} }
else { else {
h2->ehdr.e_shnum = 0; // https://bugzilla.redhat.com/show_bug.cgi?id=2131609
h2->ehdr.e_shstrndx = 0; // 0==.e_shnum is a special case for libbfd
// that requires 0==.e_shentsize in order to force "no Shdrs"
h2->ehdr.e_shentsize = 0;
h2->ehdr.e_shnum = 0;
h2->ehdr.e_shstrndx = 0;
} }
sz_elf_hdrs = sizeof(*h2) - sizeof(linfo); // default sz_elf_hdrs = sizeof(*h2) - sizeof(linfo); // default
@ -3077,9 +3081,9 @@ PackOpenBSDElf32x86::generateElfHdr(
h3->ehdr.e_shoff = 0; h3->ehdr.e_shoff = 0;
assert(get_te16(&h3->ehdr.e_ehsize) == sizeof(Elf32_Ehdr)); assert(get_te16(&h3->ehdr.e_ehsize) == sizeof(Elf32_Ehdr));
assert(get_te16(&h3->ehdr.e_phentsize) == sizeof(Elf32_Phdr)); assert(get_te16(&h3->ehdr.e_phentsize) == sizeof(Elf32_Phdr));
set_te16(&h3->ehdr.e_shentsize, sizeof(Elf32_Shdr)); h3->ehdr.e_shentsize = 0;
h3->ehdr.e_shnum = 0; h3->ehdr.e_shnum = 0;
h3->ehdr.e_shstrndx = 0; h3->ehdr.e_shstrndx = 0;
struct { struct {
Elf32_Nhdr nhdr; Elf32_Nhdr nhdr;
@ -3162,14 +3166,15 @@ PackLinuxElf64::generateElfHdr(
h2->ehdr.e_shoff = 0; h2->ehdr.e_shoff = 0;
assert(get_te16(&h2->ehdr.e_ehsize) == sizeof(Elf64_Ehdr)); assert(get_te16(&h2->ehdr.e_ehsize) == sizeof(Elf64_Ehdr));
assert(get_te16(&h2->ehdr.e_phentsize) == sizeof(Elf64_Phdr)); assert(get_te16(&h2->ehdr.e_phentsize) == sizeof(Elf64_Phdr));
set_te16(&h2->ehdr.e_shentsize, sizeof(Elf64_Shdr));
if (o_elf_shnum) { if (o_elf_shnum) {
h2->ehdr.e_shnum = o_elf_shnum; set_te16(&h2->ehdr.e_shentsize, sizeof(Elf64_Shdr));
h2->ehdr.e_shstrndx = o_elf_shnum - 1; h2->ehdr.e_shnum = o_elf_shnum;
h2->ehdr.e_shstrndx = o_elf_shnum - 1;
} }
else { else {
h2->ehdr.e_shnum = 0; h2->ehdr.e_shentsize = 0;
h2->ehdr.e_shstrndx = 0; h2->ehdr.e_shnum = 0;
h2->ehdr.e_shstrndx = 0;
} }
sz_elf_hdrs = sizeof(*h2) - sizeof(linfo); // default sz_elf_hdrs = sizeof(*h2) - sizeof(linfo); // default