Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0015a429 authored by Ben Cheng's avatar Ben Cheng
Browse files

Fix ELF header parser bug. 

Program header size should be 32 instead of 40.

Bug: 7696928

Change-Id: I8298a030790e9c28e8e8a0d2ad4e9ef294708eb6
parent 777991d9

libcorkscrew/arch-arm/ptrace-arm.c

+7 −4
Original line number Diff line number Diff line
@@ -29,12 +29,15 @@ 
static void load_exidx_header(pid_t pid, map_info_t* mi,

        uintptr_t* out_exidx_start, size_t* out_exidx_size) {

    uint32_t elf_phoff;

    uint32_t elf_phentsize_phnum;

    uint32_t elf_phentsize_ehsize;

    uint32_t elf_shentsize_phnum;

    if (try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_phoff), &elf_phoff)

            && try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_ehsize),

                    &elf_phentsize_ehsize)

            && try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_phnum),

                    &elf_phentsize_phnum)) {

        uint32_t elf_phentsize = elf_phentsize_phnum >> 16;

        uint32_t elf_phnum = elf_phentsize_phnum & 0xffff;

                    &elf_shentsize_phnum)) {

        uint32_t elf_phentsize = elf_phentsize_ehsize >> 16;

        uint32_t elf_phnum = elf_shentsize_phnum & 0xffff;

        for (uint32_t i = 0; i < elf_phnum; i++) {

            uintptr_t elf_phdr = mi->start + elf_phoff + i * elf_phentsize;

            uint32_t elf_phdr_type;