Magic-Mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx.git synced 2024-11-23 12:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PT_MIPS_ABIFLAGS, PT_MIPS_REGINFO

Browse Source 
Also re-org of PT_HOTE and other non-PT_LOAD Elf32_Phdrs
	modified:   p_lx_elf.cpp
	modified:   p_lx_elf.h
This commit is contained in:
John Reiser 2024-06-13 09:58:20 -07:00 committed by Markus F.X.J. Oberhumer
parent 3286f7c5ba
commit 99afc50ebf
2 changed files with 40 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
src/p_lx_elf.cpp
View File

@ -973,6 +973,14 @@ PackLinuxElf32::~PackLinuxElf32()
{ {
} }
void PackLinuxElf32::add_phdrx(Elf32_Phdr const *phdr)
{
if (END_PHDRX <= n_phdrx) {
throwCantPack("too many Phdr %u", (unsigned)(phdr - phdri));
}
phdrx[n_phdrx++] = phdr;
}
PackLinuxElf64::PackLinuxElf64(InputFile *f) PackLinuxElf64::PackLinuxElf64(InputFile *f)
: super(f), phdri(nullptr), shdri(nullptr), : super(f), phdri(nullptr), shdri(nullptr),
gnu_stack(nullptr), n_phdrx(0), sz_phdrx(0), gnu_stack(nullptr), n_phdrx(0), sz_phdrx(0),
@ -995,6 +1003,14 @@ PackLinuxElf64::~PackLinuxElf64()
{ {
} }
void PackLinuxElf64::add_phdrx(Elf64_Phdr const *phdr)
{
if (END_PHDRX <= n_phdrx) {
throwCantPack("too many Phdr %u", (unsigned)(phdr - phdri));
}
phdrx[n_phdrx++] = phdr;
}
// FIXME: should be templated with PackLinuxElf32help1 // FIXME: should be templated with PackLinuxElf32help1
void void
PackLinuxElf64::PackLinuxElf64help1(InputFile *f) PackLinuxElf64::PackLinuxElf64help1(InputFile *f)
@ -2496,31 +2512,20 @@ PackLinuxElf32::canPackOSABI(Elf32_Ehdr const *ehdr)
hatch_off = ~3u & (3+ get_te32(&phdr->p_memsz)); hatch_off = ~3u & (3+ get_te32(&phdr->p_memsz));
} }
if (PT_GNU_STACK32 == p_type) { if (PT_GNU_STACK32 == p_type) {
if (END_PHDRX <= n_phdrx) { add_phdrx(phdr);
throwCantPack("too many Phdr %u", (unsigned)(phdr - phdri));
}
phdrx[n_phdrx++] = phdr;
} }
if (EM_MIPS == e_machine if (EM_MIPS == e_machine
&& (Elf32_Phdr::PT_MIPS_ABIFLAGS == p_type && (Elf32_Phdr::PT_MIPS_ABIFLAGS == p_type
|| Elf32_Phdr::PT_MIPS_REGINFO == p_type) || Elf32_Phdr::PT_MIPS_REGINFO == p_type)
) { ) {
if (END_PHDRX <= n_phdrx) { add_phdrx(phdr);
throwCantPack("too many Phdr %u", (unsigned)(phdr - phdri));
}
phdrx[n_phdrx++] = phdr;
unsigned mask = -1+ get_te32(&phdr->p_align); unsigned mask = -1+ get_te32(&phdr->p_align);
sz_phdrx = ~mask & (mask + sz_phdrx); sz_phdrx = ~mask & (mask + sz_phdrx);
sz_phdrx += get_te32(&phdr->p_memsz); sz_phdrx += get_te32(&phdr->p_memsz);
} }
if (PT_NOTE32 == p_type) { if (PT_NOTE32 == p_type) {
unsigned const x = get_te32(&phdr->p_memsz); add_phdrx(phdr);
if ( sizeof(elfout.notes) < x // beware overflow of note_size
|| (sizeof(elfout.notes) < (note_size += x)) ) {
throwCantPack("PT_NOTEs too big; try '--force-execve'");
return false;
}
if (osabi_note && Elf32_Ehdr::ELFOSABI_NONE==osabi0) { // Still seems to be generic. if (osabi_note && Elf32_Ehdr::ELFOSABI_NONE==osabi0) { // Still seems to be generic.
struct { struct {
struct Elf32_Nhdr nhdr; struct Elf32_Nhdr nhdr;
@ -2969,21 +2974,6 @@ bad:
throwCantPack(buf); throwCantPack(buf);
goto abandon; goto abandon;
} }
if (!opt->o_unix.android_shlib
&& !saved_opt_android_shlib
) {
phdr = phdri;
for (unsigned j= 0; j < e_phnum; ++phdr, ++j) {
unsigned const vaddr = get_te32(&phdr->p_vaddr);
if (PT_NOTE32 == get_te32(&phdr->p_type)
&& xct_va < vaddr) {
char buf[40]; snprintf(buf, sizeof(buf),
"PT_NOTE %#x above stub", vaddr);
throwCantPack(buf);
goto abandon;
}
}
}
xct_off = elf_get_offset_from_address(xct_va); xct_off = elf_get_offset_from_address(xct_va);
if (opt->debug.debug_level) { if (opt->debug.debug_level) {
fprintf(stderr, "shlib canPack: xct_va=%#lx xct_off=%#lx\n", fprintf(stderr, "shlib canPack: xct_va=%#lx xct_off=%#lx\n",
@ -3395,21 +3385,6 @@ tribool PackLinuxElf64::canPack()
throwCantPack(buf); throwCantPack(buf);
goto abandon; goto abandon;
} }
if (!opt->o_unix.android_shlib
&& !saved_opt_android_shlib
) {
phdr = phdri;
for (unsigned j= 0; j < e_phnum; ++phdr, ++j) {
upx_uint64_t const vaddr = get_te64(&phdr->p_vaddr);
if (PT_NOTE64 == get_te32(&phdr->p_type)
&& xct_va < vaddr) {
char buf[40]; snprintf(buf, sizeof(buf),
"PT_NOTE %#lx above stub", (unsigned long)vaddr);
throwCantPack(buf);
goto abandon;
}
}
}
xct_off = elf_get_offset_from_address(xct_va); xct_off = elf_get_offset_from_address(xct_va);
if (opt->debug.debug_level) { if (opt->debug.debug_level) {
fprintf(stderr, "shlib canPack: xct_va=%#lx xct_off=%#lx\n", fprintf(stderr, "shlib canPack: xct_va=%#lx xct_off=%#lx\n",
@ -3483,6 +3458,12 @@ PackLinuxElf64::getbrk(const Elf64_Phdr *phdr, int nph) const
return brka; return brka;
} }
static unsigned
is_pow2(unsigned x)
{
return !((-1 + x) & x);
}
void void
PackLinuxElf32::generateElfHdr( PackLinuxElf32::generateElfHdr(
OutputFile *fo, OutputFile *fo,
@ -3496,7 +3477,7 @@ PackLinuxElf32::generateElfHdr(
h3->phdr[C_BASE] = ((cprElfHdr3 const *)proto)->phdr[1]; // .data; .p_align h3->phdr[C_BASE] = ((cprElfHdr3 const *)proto)->phdr[1]; // .data; .p_align
h3->phdr[C_TEXT] = ((cprElfHdr3 const *)proto)->phdr[0]; // .text h3->phdr[C_TEXT] = ((cprElfHdr3 const *)proto)->phdr[0]; // .text
if (3 <= get_te16(&h3->ehdr.e_phnum)) { if (3 <= get_te16(&h3->ehdr.e_phnum)) {
phdrx[n_phdrx++] = &((cprElfHdr3 const *)proto)->phdr[2]; // probably PT_GNU_STACK add_phdrx(&((cprElfHdr3 const *)proto)->phdr[2]); // PT_GNU_STACK ?
} }
h3->ehdr.e_type = ehdri.e_type; // ET_EXEC vs ET_DYN (gcc -pie -fPIC) h3->ehdr.e_type = ehdri.e_type; // ET_EXEC vs ET_DYN (gcc -pie -fPIC)
@ -3569,23 +3550,24 @@ PackLinuxElf32::generateElfHdr(
Elf32_Phdr phtmp = *phdrx[j]; Elf32_Phdr phtmp = *phdrx[j];
phtmp.p_vaddr = phtmp.p_paddr = 0; phtmp.p_vaddr = phtmp.p_paddr = 0;
unsigned const off_i = get_te32(&phtmp.p_offset); unsigned const off_i = get_te32(&phtmp.p_offset);
unsigned const memsz = get_te32(&phtmp.p_memsz); unsigned const align = get_te32(&phtmp.p_align);
unsigned const filesz = get_te32(&phtmp.p_filesz);
unsigned pad = 0; unsigned pad = 0;
if (memsz) { // align if (filesz && align && is_pow2(align)) {
unsigned alm1 = -1 + umin(8u, get_te32(&phtmp.p_align)); unsigned alm1 = -1 + umin(8u, align);
pad = alm1 & -off_o; pad = alm1 & -off_o;
off_o += pad; off_o += pad;
set_te32(&phtmp.p_vaddr, off_o + uva0); phtmp.p_paddr = phtmp.p_vaddr; set_te32(&phtmp.p_vaddr, off_o + uva0); phtmp.p_paddr = phtmp.p_vaddr;
} }
if (0==phase) { if (0==phase) {
set_te32(&phtmp.p_offset, (memsz ? off_o : 0)); set_te32(&phtmp.p_offset, (filesz ? off_o : 0));
fo->write(&phtmp, sizeof(phtmp)); // Phdr fo->write(&phtmp, sizeof(phtmp)); // Phdr
} }
if (1==phase) { if (1==phase) {
if (pad) fo->write(&zero_pad, pad); if (pad) fo->write(&zero_pad, pad);
if (memsz) fo->write(&file_image[off_i], memsz); // body if (filesz) fo->write(&file_image[off_i], filesz); // body
} }
off_o += memsz; off_o += filesz;
} }
} }
off_o = fpad4(fo, off_o); off_o = fpad4(fo, off_o);
@ -3607,8 +3589,8 @@ PackNetBSDElf32x86::generateElfHdr(
unsigned const brka unsigned const brka
) )
{ {
super::generateElfHdr(fo, proto, brka);
cprElfHdr2 *const h2 = (cprElfHdr2 *)(void *)&elfout; cprElfHdr2 *const h2 = (cprElfHdr2 *)(void *)&elfout;
super::generateElfHdr(fo, proto, brka);
sz_elf_hdrs = sizeof(*h2) - sizeof(linfo); sz_elf_hdrs = sizeof(*h2) - sizeof(linfo);
unsigned note_offset = sz_elf_hdrs; unsigned note_offset = sz_elf_hdrs;
@ -4017,26 +3999,9 @@ void PackLinuxElf32::pack1(OutputFile * /*fo*/, Filter &ft)
ph.method = ph_force_method(method_best); ph.method = ph_force_method(method_best);
} }
note_size = 0;
Elf32_Phdr *phdr = phdri; Elf32_Phdr *phdr = phdri;
for (unsigned j=0; j < e_phnum; ++phdr, ++j) {
if (PT_NOTE32 == get_te32(&phdr->p_type)) {
note_size += up4(get_te32(&phdr->p_filesz));
}
}
if (note_size) {
note_body.alloc(note_size);
note_size = 0;
}
phdr = phdri;
for (unsigned j=0; j < e_phnum; ++phdr, ++j) { for (unsigned j=0; j < e_phnum; ++phdr, ++j) {
unsigned const type = get_te32(&phdr->p_type); unsigned const type = get_te32(&phdr->p_type);
unsigned const len = get_te32(&phdr->p_filesz);
if (PT_NOTE32 == type && len && note_body.getSize()) {
fi->seek(get_te32(&phdr->p_offset), SEEK_SET);
fi->readx(&note_body[note_size], len);
note_size += up4(len);
}
if (PT_LOAD32 == type) { if (PT_LOAD32 == type) {
unsigned x = get_te32(&phdr->p_align) >> lg2_page; unsigned x = get_te32(&phdr->p_align) >> lg2_page;
while (x>>=1) { while (x>>=1) {
@ -4275,18 +4240,7 @@ void PackLinuxElf64::asl_pack2_Shdrs(OutputFile *fo, unsigned pre_xct_top)
for (unsigned j = 0; j < e_phnum; ++j, ++phdr) { for (unsigned j = 0; j < e_phnum; ++j, ++phdr) {
upx_uint64_t offset = get_te64(&phdr->p_offset); upx_uint64_t offset = get_te64(&phdr->p_offset);
if (xct_off <= offset) { // above the extra page if (xct_off <= offset) { // above the extra page
if (PT_NOTE64 == get_te32(&phdr->p_type)) { {
upx_uint64_t memsz = get_te64(&phdr->p_memsz);
if (sizeof(buf_notes) < (memsz + len_notes)) {
throwCantPack("PT_NOTES too big");
}
set_te64(&phdr->p_vaddr,
len_notes + (e_shnum * sizeof(Elf64_Shdr)) + xct_off);
phdr->p_offset = phdr->p_paddr = phdr->p_vaddr;
memcpy(&buf_notes[len_notes], &file_image[offset], memsz);
len_notes += memsz;
}
else {
//set_te64(&phdr->p_offset, asl_delta + offset); // physical //set_te64(&phdr->p_offset, asl_delta + offset); // physical
upx_uint64_t addr = get_te64(&phdr->p_paddr); upx_uint64_t addr = get_te64(&phdr->p_paddr);
set_te64(&phdr->p_paddr, asl_delta + addr); set_te64(&phdr->p_paddr, asl_delta + addr);
@ -4518,18 +4472,7 @@ void PackLinuxElf32::asl_pack2_Shdrs(OutputFile *fo, unsigned pre_xct_top)
for (unsigned j = 0; j < e_phnum; ++j, ++phdr) { for (unsigned j = 0; j < e_phnum; ++j, ++phdr) {
upx_uint32_t offset = get_te32(&phdr->p_offset); upx_uint32_t offset = get_te32(&phdr->p_offset);
if (xct_off <= offset) { // above the extra page if (xct_off <= offset) { // above the extra page
if (PT_NOTE32 == get_te32(&phdr->p_type)) { {
upx_uint32_t memsz = get_te32(&phdr->p_memsz);
if (sizeof(buf_notes) < (memsz + len_notes)) {
throwCantPack("PT_NOTES too big");
}
set_te32(&phdr->p_vaddr,
len_notes + (e_shnum * sizeof(Elf32_Shdr)) + xct_off);
phdr->p_offset = phdr->p_paddr = phdr->p_vaddr;
memcpy(&buf_notes[len_notes], &file_image[offset], memsz);
len_notes += memsz;
}
else {
//set_te32(&phdr->p_offset, asl_delta + offset); // physical //set_te32(&phdr->p_offset, asl_delta + offset); // physical
upx_uint32_t v_addr = get_te32(&phdr->p_vaddr); upx_uint32_t v_addr = get_te32(&phdr->p_vaddr);
set_te32(&phdr->p_vaddr, asl_delta + v_addr); set_te32(&phdr->p_vaddr, asl_delta + v_addr);
@ -4906,26 +4849,9 @@ void PackLinuxElf64::pack1(OutputFile * /*fo*/, Filter &ft)
ph.method = ph_force_method(method_best); ph.method = ph_force_method(method_best);
} }
note_size = 0;
Elf64_Phdr *phdr = phdri; Elf64_Phdr *phdr = phdri;
for (unsigned j=0; j < e_phnum; ++phdr, ++j) {
if (PT_NOTE64 == get_te32(&phdr->p_type)) {
note_size += up4(get_te64(&phdr->p_filesz));
}
}
if (note_size) {
note_body.alloc(note_size);
note_size = 0;
}
phdr = phdri;
for (unsigned j=0; j < e_phnum; ++phdr, ++j) { for (unsigned j=0; j < e_phnum; ++phdr, ++j) {
unsigned const type = get_te32(&phdr->p_type); unsigned const type = get_te32(&phdr->p_type);
if (PT_NOTE64 == type) {
unsigned const len = get_te64(&phdr->p_filesz);
fi->seek(get_te64(&phdr->p_offset), SEEK_SET);
fi->readx(&note_body[note_size], len);
note_size += up4(len);
}
if (PT_LOAD64 == type) { if (PT_LOAD64 == type) {
unsigned x = get_te64(&phdr->p_align) >> lg2_page; unsigned x = get_te64(&phdr->p_align) >> lg2_page;
while (x>>=1) { while (x>>=1) {
@ -6222,15 +6148,6 @@ void PackLinuxElf64::pack4(OutputFile *fo, Filter &ft)
set_te64(&eho->phdr[C_TEXT].p_filesz, sz_pack2 + lsize); set_te64(&eho->phdr[C_TEXT].p_filesz, sz_pack2 + lsize);
eho->phdr[C_TEXT].p_memsz = eho->phdr[C_TEXT].p_filesz; eho->phdr[C_TEXT].p_memsz = eho->phdr[C_TEXT].p_filesz;
Elf64_Phdr *phdr = &eho->phdr[C_NOTE];
if (PT_NOTE64 == get_te32(&phdr->p_type)) {
upx_uint64_t const reloc = get_te64(&eho->phdr[C_TEXT].p_vaddr);
set_te64( &phdr->p_vaddr,
reloc + get_te64(&phdr->p_vaddr));
set_te64( &phdr->p_paddr,
reloc + get_te64(&phdr->p_paddr));
// FIXME fo->rewrite(&elfnote, sizeof(elfnote));
}
fo->rewrite(eho, sz_elf_hdrs); fo->rewrite(eho, sz_elf_hdrs);
fo->rewrite(&linfo, sizeof(linfo)); fo->rewrite(&linfo, sizeof(linfo));
} }

6
src/p_lx_elf.h
View File

@ -215,6 +215,7 @@ protected:
virtual upx_uint64_t elf_unsigned_dynamic(unsigned) const override; virtual upx_uint64_t elf_unsigned_dynamic(unsigned) const override;
unsigned find_dt_ndx(unsigned rva); unsigned find_dt_ndx(unsigned rva);
virtual int adjABS(Elf32_Sym *sym, unsigned delta); virtual int adjABS(Elf32_Sym *sym, unsigned delta);
void add_phdrx(Elf32_Phdr const *);
char const *get_str_name(unsigned st_name, unsigned symnum) const; char const *get_str_name(unsigned st_name, unsigned symnum) const;
char const *get_dynsym_name(unsigned symnum, unsigned relnum) const; char const *get_dynsym_name(unsigned symnum, unsigned relnum) const;
@ -224,7 +225,7 @@ protected:
Elf32_Shdr *shdri; // from input file Elf32_Shdr *shdri; // from input file
Elf32_Shdr *shdro; // for output file Elf32_Shdr *shdro; // for output file
Elf32_Phdr const *gnu_stack; // propagate NX Elf32_Phdr const *gnu_stack; // propagate NX
static unsigned const END_PHDRX = 4; static unsigned const END_PHDRX = 5;
Elf32_Phdr const *phdrx[END_PHDRX]; // "extra" arch-specific Phdr Elf32_Phdr const *phdrx[END_PHDRX]; // "extra" arch-specific Phdr
unsigned n_phdrx; // number actually used unsigned n_phdrx; // number actually used
unsigned sz_phdrx; // total size of bodies unsigned sz_phdrx; // total size of bodies
@ -380,6 +381,7 @@ protected:
virtual upx_uint64_t elf_unsigned_dynamic(unsigned) const override; virtual upx_uint64_t elf_unsigned_dynamic(unsigned) const override;
unsigned find_dt_ndx(u64_t rva); unsigned find_dt_ndx(u64_t rva);
virtual int adjABS(Elf64_Sym *sym, unsigned long delta); virtual int adjABS(Elf64_Sym *sym, unsigned long delta);
void add_phdrx(Elf64_Phdr const *);
char const *get_str_name(unsigned st_name, unsigned symnum) const; char const *get_str_name(unsigned st_name, unsigned symnum) const;
char const *get_dynsym_name(unsigned symnum, unsigned relnum) const; char const *get_dynsym_name(unsigned symnum, unsigned relnum) const;
@ -389,7 +391,7 @@ protected:
Elf64_Shdr *shdri; // from input file Elf64_Shdr *shdri; // from input file
Elf64_Shdr *shdro; // for output file Elf64_Shdr *shdro; // for output file
Elf64_Phdr const *gnu_stack; // propagate NX Elf64_Phdr const *gnu_stack; // propagate NX
static unsigned const END_PHDRX = 4; static unsigned const END_PHDRX = 5;
Elf64_Phdr const *phdrx[END_PHDRX]; // "extra" arch-specific Phdr Elf64_Phdr const *phdrx[END_PHDRX]; // "extra" arch-specific Phdr
unsigned n_phdrx; // number actually used unsigned n_phdrx; // number actually used
unsigned sz_phdrx; // total size of bodies unsigned sz_phdrx; // total size of bodies