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

SHT_NOTE with ~SHF_ALLOC; as for 'gold' linker version

Browse Source 
https://github.com/upx/upx/issues/243
	modified:   p_lx_elf.cpp
This commit is contained in:
John Reiser
2019-02-12 21:13:24 -08:00
parent 3c2bfc742e
commit d1c80154f6
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+21 -9
View File
@@ -3012,7 +3012,7 @@ void PackLinuxElf32::pack1(OutputFile *fo, Filter & /*ft*/)
if (PT_NOTE32 == get_te32(&phdr->p_type)) { if (PT_NOTE32 == get_te32(&phdr->p_type)) {
upx_uint32_t memsz = get_te32(&phdr->p_memsz); upx_uint32_t memsz = get_te32(&phdr->p_memsz);
if (sizeof(buf_notes) < (memsz + len_notes)) { if (sizeof(buf_notes) < (memsz + len_notes)) {
throwCantPack("PT_NOTES too big"); throwCantPack("PT_NOTEs too big");
} }
set_te32(&phdr->p_vaddr, set_te32(&phdr->p_vaddr,
len_notes + (e_shnum * sizeof(Elf32_Shdr)) + xct_off); len_notes + (e_shnum * sizeof(Elf32_Shdr)) + xct_off);
@@ -3136,11 +3136,17 @@ void PackLinuxElf32::pack1(OutputFile *fo, Filter & /*ft*/)
fo->rewrite(rel0, sh_size); fo->rewrite(rel0, sh_size);
} }
if (Elf32_Shdr::SHT_NOTE == sh_type) { if (Elf32_Shdr::SHT_NOTE == sh_type) {
if (xct_off <= sh_offset) { if (!(Elf32_Shdr::SHF_ALLOC & get_te32(&shdr->sh_flags))) {
set_te32(&shdr->sh_offset, // example: version number of 'gold' linker (static binder)
(e_shnum * sizeof(Elf32_Shdr)) + xct_off); if (sizeof(buf_notes) < (sh_size + len_notes)) {
shdr->sh_addr = shdr->sh_offset; throwCantPack("SHT_NOTEs too big");
}
set_te32(&shdro[j].sh_offset,
len_notes + (e_shnum * sizeof(Elf32_Shdr)) + xct_off);
memcpy(&buf_notes[len_notes], &file_image[sh_offset], sh_size);
len_notes += sh_size;
} }
// else: SHF_ALLOC, thus already in PT_LOAD
} }
} }
// shstrndx will move // shstrndx will move
@@ -3518,11 +3524,17 @@ void PackLinuxElf64::pack1(OutputFile *fo, Filter & /*ft*/)
} }
} }
if (Elf64_Shdr::SHT_NOTE == sh_type) { if (Elf64_Shdr::SHT_NOTE == sh_type) {
if (xct_off <= sh_offset) { if (!(Elf64_Shdr::SHF_ALLOC & get_te64(&shdr->sh_flags))) {
set_te64(&shdr->sh_offset, // example: version numer of 'gold' linker (static binder)
(e_shnum * sizeof(Elf64_Shdr)) + xct_off); if (sizeof(buf_notes) < (sh_size + len_notes)) {
shdr->sh_addr = shdr->sh_offset; throwCantPack("SHT_NOTEs too big");
}
set_te64(&shdro[j].sh_offset,
len_notes + (e_shnum * sizeof(Elf64_Shdr)) + xct_off);
memcpy(&buf_notes[len_notes], &file_image[sh_offset], sh_size);
len_notes += sh_size;
} }
// else: SHF_ALLOC, thus already in PT_LOAD
} }
} }
// shstrndx will move // shstrndx will move