portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix elf e_entry generation

Browse source 
commit 01b6e60775 refactored the elf
interface, and in particular the elf generation process.
when generating the elf header, the base address was forgotten, causing
generated elfs to have very small base addresses (thus segfault
immediately).

this commit fixes this regression.
This commit is contained in:
Gilad Reti 2023-04-22 15:46:07 +03:00 committed by Anton Kochkov
parent 084533b04e
commit beeef61a6a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
librz/bin/p/bin_elf.inc
View file

@ -407,12 +407,12 @@ static bool create_set_e_machine(RzBuffer *result, bool is_arm) {
#endif #endif
} }
static bool create_set_ehdr(RzBuffer *result, bool is_arm) { static bool create_set_ehdr(RzBuffer *result, Elf_(Word) baddr, bool is_arm) {
return create_set_e_ident(result) && return create_set_e_ident(result) &&
rz_buf_append_ut16(result, ET_EXEC) && rz_buf_append_ut16(result, ET_EXEC) &&
create_set_e_machine(result, is_arm) && create_set_e_machine(result, is_arm) &&
rz_buf_append_ut32(result, EV_CURRENT) && rz_buf_append_ut32(result, EV_CURRENT) &&
rz_buf_append_word(result, sizeof(Elf_(Ehdr)) + sizeof(Elf_(Phdr))) && // e_entry rz_buf_append_word(result, baddr + sizeof(Elf_(Ehdr)) + sizeof(Elf_(Phdr))) && // e_entry
rz_buf_append_word(result, sizeof(Elf_(Ehdr))) && // e_phoff rz_buf_append_word(result, sizeof(Elf_(Ehdr))) && // e_phoff
rz_buf_append_word(result, 0) && // e_shoff rz_buf_append_word(result, 0) && // e_shoff
rz_buf_append_ut32(result, 0) && // e_flags rz_buf_append_ut32(result, 0) && // e_flags
@ -467,7 +467,7 @@ static RzBuffer *create_elf(RzBin *bin, const ut8 *code, int codelen, const ut8
bool is_arm = !strcmp(opt->arch, "arm"); bool is_arm = !strcmp(opt->arch, "arm");
Elf_(Word) baddr = create_get_baddr(is_arm); Elf_(Word) baddr = create_get_baddr(is_arm);
if (!create_set_ehdr(result, is_arm) || if (!create_set_ehdr(result, baddr, is_arm) ||
!create_set_phdr(result, baddr, codelen) || !create_set_phdr(result, baddr, codelen) ||
!rz_buf_append_bytes(result, code, codelen)) { !rz_buf_append_bytes(result, code, codelen)) {
rz_buf_free(result); rz_buf_free(result);