Commit 8c33516f authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 628233 part 1 - Make the Android linker stop assuming there is only one... 

Bug 628233 part 1 - Make the Android linker stop assuming there is only one read-only PT_LOAD entry. r=mwu,a=sdwilsh
parent 8eb36d7f

other-licenses/android/linker.c

+3 −4
Original line number Diff line number Diff line
@@ -1410,12 +1410,11 @@ static int reloc_library(soinfo *si, Elf32_Rel *rel, unsigned count) 
    Elf32_Phdr *phdr = (Elf32_Phdr *)((unsigned char *)si->base + ehdr->e_phoff);

    for (cnt = 0; cnt < ehdr->e_phnum; ++cnt, ++phdr) {

        if (phdr->p_type != PT_LOAD ||

            PFLAGS_TO_PROT(phdr->p_flags) & PROT_WRITE ||

            phdr->p_vaddr != 0)

            PFLAGS_TO_PROT(phdr->p_flags) & PROT_WRITE)

            continue;



        ro_region_end = si->base + phdr->p_filesz;

        break;

        if (si->base + phdr->p_vaddr + phdr->p_filesz > ro_region_end)

            ro_region_end = si->base + phdr->p_vaddr + phdr->p_filesz;

    }



    void * remapped_page = NULL;