jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix size of 'imul'

Browse Source 
modified:   src/stub/src/i386-linux.elf-fold.S
	modified:   src/p_lx_elf.cpp

	modified:   .github/travis_testsuite_1.sh
	modified:   src/stub/i386-linux.elf-fold.h
	modified:   src/stub/tmp/i386-linux.elf-fold.map
This commit is contained in:
John Reiser
2017-04-26 15:24:19 -07:00
parent 9be94e4b58
commit 24c924d668
5 changed files with 28 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
-26
View File
@@ -3610,19 +3610,6 @@ void PackLinuxElf32::pack4(OutputFile *fo, Filter &ft)
elfout.phdr[0].p_memsz = elfout.phdr[0].p_filesz;
super::pack4(fo, ft); // write PackHeader and overlay_offset
// rewrite Elf header
if (Elf32_Ehdr::ET_DYN==get_te16(&ehdri.e_type)) {
unsigned const base= get_te32(&elfout.phdr[0].p_vaddr);
set_te16(&elfout.ehdr.e_type, Elf32_Ehdr::ET_DYN);
set_te16(&elfout.ehdr.e_phnum, 1);
set_te32( &elfout.ehdr.e_entry,
get_te32(&elfout.ehdr.e_entry) - base);
set_te32(&elfout.phdr[0].p_vaddr, get_te32(&elfout.phdr[0].p_vaddr) - base);
set_te32(&elfout.phdr[0].p_paddr, get_te32(&elfout.phdr[0].p_paddr) - base);
// Strict SELinux (or PaX, grSecurity) disallows PF_W with PF_X
//elfout.phdr[0].p_flags |= Elf32_Phdr::PF_W;
}
fo->seek(0, SEEK_SET);
if (0!=xct_off) { // shared library
fo->rewrite(&ehdri, sizeof(ehdri));
@@ -3741,19 +3728,6 @@ void PackLinuxElf64::pack4(OutputFile *fo, Filter &ft)
elfout.phdr[0].p_memsz = elfout.phdr[0].p_filesz;
super::pack4(fo, ft); // write PackHeader and overlay_offset
// rewrite Elf header
if (Elf64_Ehdr::ET_DYN==get_te16(&ehdri.e_type)) {
upx_uint64_t const base= get_te64(&elfout.phdr[0].p_vaddr);
set_te16(&elfout.ehdr.e_type, Elf64_Ehdr::ET_DYN);
set_te16(&elfout.ehdr.e_phnum, 1);
set_te64( &elfout.ehdr.e_entry,
get_te64(&elfout.ehdr.e_entry) - base);
set_te64(&elfout.phdr[0].p_vaddr, get_te64(&elfout.phdr[0].p_vaddr) - base);
set_te64(&elfout.phdr[0].p_paddr, get_te64(&elfout.phdr[0].p_paddr) - base);
// Strict SELinux (or PaX, grSecurity) disallows PF_W with PF_X
//elfout.phdr[0].p_flags |= Elf64_Phdr::PF_W;
}
fo->seek(0, SEEK_SET);
if (0!=xct_off) { // shared library
fo->rewrite(&ehdri, sizeof(ehdri));
src/stub/i386-linux.elf-fold.h
+18 -18
View File
@@ -32,8 +32,8 @@
#define STUB_I386_LINUX_ELF_FOLD_SIZE 1758
#define STUB_I386_LINUX_ELF_FOLD_ADLER32 0x63c7f6f3
#define STUB_I386_LINUX_ELF_FOLD_CRC32 0x572fb338
#define STUB_I386_LINUX_ELF_FOLD_ADLER32 0xb898f888
#define STUB_I386_LINUX_ELF_FOLD_CRC32 0xf0b90466
unsigned char stub_i386_linux_elf_fold[1758] = {
/* 0x0000 */ 127, 69, 76, 70, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -45,23 +45,23 @@ unsigned char stub_i386_linux_elf_fold[1758] = {
/* 0x0060 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 0x0070 */ 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 0x0080 */ 87, 83, 41,201,186,120, 2, 0, 0,137,230,137,231, 41,219,232,
/* 0x0090 */ 185, 0, 0, 0,141, 89, 4,137,230,209,234, 25,192, 41,193,141,
/* 0x00a0 */ 36,196,133,210,117,243,129,236, 8, 16, 0, 0,137,231,232,154,
/* 0x0090 */ 188, 0, 0, 0,141, 89, 4,137,230,209,234, 25,192, 41,193,141,
/* 0x00a0 */ 36,196,133,210,117,243,129,236, 8, 16, 0, 0,137,231,232,157,
/* 0x00b0 */ 0, 0, 0,199, 6, 32, 32, 32, 61,137, 51,186, 0, 16, 0, 0,
/* 0x00c0 */ 141, 78, 4,232, 15, 0, 0, 0, 47,112,114,111, 99, 47,115,101,
/* 0x00d0 */ 108,102, 47,101,120,101, 0, 91,106, 85, 88,205,128,133,192,120,
/* 0x00e0 */ 4,198, 4, 1, 0, 91, 94,129,236, 0, 10, 0, 0, 83,139, 83,
/* 0x00f0 */ 72,141,148, 26,255, 31, 0, 0,129,226, 0,240,255,255, 82, 41,
/* 0x0100 */ 192,102,131,123, 16, 3,117, 1,146, 80,107, 67, 44, 32,141, 68,
/* 0x0110 */ 24, 76,139, 24,139, 72, 4,131,193, 12,141, 84, 36, 12, 96, 71,
/* 0x0120 */ 232,113, 4, 0, 0,131,196, 36, 89, 91,129,196, 0, 10, 0, 0,
/* 0x0130 */ 90,193,226, 12, 1,211, 80, 79, 41,192, 60,175,175,117,252, 80,
/* 0x0140 */ 80, 80, 80, 80, 80, 80, 80, 41,217,176, 91,255, 39,173,171,173,
/* 0x0150 */ 171,173,171,173,171,173,171,133,192,117,250,135,223, 1,223,173,
/* 0x0160 */ 171,133,192,117,250, 87,173,171,131,248, 32,115, 3, 15,179,194,
/* 0x0170 */ 133,192,173,171,117,240,131,239, 8, 1,201, 64,243,171, 72,171,
/* 0x0180 */ 171,137,254, 95,195, 83,141, 92, 36, 8,106, 90, 88,205,128, 91,
/* 0x0190 */ 195, 0, 0, 0, 87, 86,137,206, 83,137,195, 57, 8,139,120, 4,
/* 0x0100 */ 192,102,131,123, 16, 3,117, 1,146, 80, 15,183, 67, 44,107,192,
/* 0x0110 */ 32,141, 68, 24, 76,139, 24,139, 72, 4,131,193, 12,141, 84, 36,
/* 0x0120 */ 12, 96, 71,232,110, 4, 0, 0,131,196, 36, 89, 91,129,196, 0,
/* 0x0130 */ 10, 0, 0, 90,193,226, 12, 1,211, 80, 79, 41,192, 60,175,175,
/* 0x0140 */ 117,252, 80, 80, 80, 80, 80, 80, 80, 80, 41,217,176, 91,255, 39,
/* 0x0150 */ 173,171,173,171,173,171,173,171,173,171,133,192,117,250,135,223,
/* 0x0160 */ 1,223,173,171,133,192,117,250, 87,173,171,131,248, 32,115, 3,
/* 0x0170 */ 15,179,194,133,192,173,171,117,240,131,239, 8, 1,201, 64,243,
/* 0x0180 */ 171, 72,171,171,137,254, 95,195, 83,141, 92, 36, 8,106, 90, 88,
/* 0x0190 */ 205,128, 91,195, 87, 86,137,206, 83,137,195, 57, 8,139,120, 4,
/* 0x01a0 */ 115, 10,106,127, 91,106, 1, 88,205,128,235,254,133,201,116, 8,
/* 0x01b0 */ 138, 7, 71,136, 2, 66,226,248, 1,115, 4, 41, 51, 91, 94, 95,
/* 0x01c0 */ 195, 85,137,229, 87, 86,137,198, 83,137,211,131,236, 24,139, 69,
@@ -89,7 +89,7 @@ unsigned char stub_i386_linux_elf_fold[1758] = {
/* 0x0320 */ 3, 81, 20, 57,215,115, 2,137,215,131,193, 32, 75,117,227,129,
/* 0x0330 */ 230, 0,240,255,255, 41,247,137,242,141,159,255, 15, 0, 0,129,
/* 0x0340 */ 227, 0,240,255,255,133,192,117, 22,106, 0,131,200, 34,106,255,
/* 0x0350 */ 80,106, 0, 83, 86,232, 43,254,255,255,131,196, 24,137,194,141,
/* 0x0350 */ 80,106, 0, 83, 86,232, 46,254,255,255,131,196, 24,137,194,141,
/* 0x0360 */ 4, 26, 41,242,139,117,224,137, 85,200,137, 69,240,102,131,126,
/* 0x0370 */ 44, 0,199, 69,196, 0, 0, 0, 0, 15,132,221, 1, 0, 0,131,
/* 0x0380 */ 125,220, 0,116, 32,139, 69,204,131, 56, 6,117, 24,139, 77,200,
@@ -100,11 +100,11 @@ unsigned char stub_i386_linux_elf_fold[1758] = {
/* 0x03d0 */ 232,131,225, 7,137, 69,236,137, 77,192,139, 78, 20,137,198, 1,
/* 0x03e0 */ 193,137, 77,188,137,193,129,225,255, 15, 0, 0, 41,206,131,125,
/* 0x03f0 */ 220, 0,141, 60, 10,116, 63,106, 0,139, 69,192,106,255,106, 50,
/* 0x0400 */ 131,200, 2, 80,141, 71, 3, 80, 86,232,119,253,255,255,131,196,
/* 0x0400 */ 131,200, 2, 80,141, 71, 3, 80, 86,232,122,253,255,255,131,196,
/* 0x0410 */ 24, 57,198, 15,133,221, 0, 0, 0,128,227, 4,139, 69,208,117,
/* 0x0420 */ 2, 49,192, 80,139, 69,220,255,117,228,141, 85,232,232,143,253,
/* 0x0430 */ 255,255, 88, 90,235, 35,139, 93,204,139, 67, 4, 41,200, 80,255,
/* 0x0440 */ 117,228,106, 18,255,117,192, 87, 86,232, 55,253,255,255,131,196,
/* 0x0440 */ 117,228,106, 18,255,117,192, 87, 86,232, 58,253,255,255,131,196,
/* 0x0450 */ 24, 57,198, 15,133,157, 0, 0, 0,137,248,247,216, 37,255, 15,
/* 0x0460 */ 0, 0,246, 69,192, 2,137, 69,184,116, 18,131,125,184, 0,141,
/* 0x0470 */ 4, 62,116, 9,139, 77,184,198, 0, 0, 64,226,250,131,125,220,
@@ -117,7 +117,7 @@ unsigned char stub_i386_linux_elf_fold[1758] = {
/* 0x04e0 */ 254,232,187,253,255,255,137,243,137,249,139, 85,192,106,125, 88,
/* 0x04f0 */ 205,128,133,192,116, 10,106,127, 91,106, 1, 88,205,128,235,254,
/* 0x0500 */ 139, 85,184,141, 4, 23,141, 28, 6, 59, 93,188,115, 30,106, 0,
/* 0x0510 */ 106,255,106, 50,255,117,192, 41, 93,188,255,117,188, 83,232, 98,
/* 0x0510 */ 106,255,106, 50,255,117,192, 41, 93,188,255,117,188, 83,232,101,
/* 0x0520 */ 252,255,255,131,196, 24, 57,195,116, 27,235,202,131,125,220, 0,
/* 0x0530 */ 116, 19,141, 79, 3,129,225,255, 15, 0, 0,131,249, 3,119, 5,
/* 0x0540 */ 106, 91, 88,205,128,139, 77,224,255, 69,196, 15,183, 65, 44,131,
src/stub/src/i386-linux.elf-fold.S
+2 -1
View File
@@ -139,7 +139,8 @@ L55:
L53:
push eax // dynbase
imul eax,[e_phnum + ebx],szElf32_Phdr // sz_Phdrs
movzwl eax,[e_phnum + ebx]
imul eax,szElf32_Phdr // sz_Phdrs
lea eax, [szElf32_Ehdr + eax + szl_info + szp_info + ebx] // 1st &b_info
mov ebx, [ eax] // length of uncompressed ELF headers
mov ecx, [4+ eax] // length of compressed ELF headers
src/stub/tmp/i386-linux.elf-fold.map
+1 -1
View File
@@ -12,7 +12,7 @@ TARGET(elf32-i386)
.text 0x0000000000c01080 0x660
*(.text)
.text 0x0000000000c01080 0x114 tmp/i386-linux.elf-fold.o
0x0000000000c01185 mmap
0x0000000000c01188 mmap
.text 0x0000000000c01194 0x54a tmp/i386-linux.elf-main.o
0x0000000000c01596 upx_main
*(.data)