Skip to content

Corruption with program headers #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Corruption with program headers #243

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
498d9d0
Merge pull request #1 from NixOS/master
eytanaim Sep 22, 2020
4a61b24
Fix corrupted prog headers
eytannnaim Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/patchelf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,12 +757,15 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()
PT_LOAD segment located directly after the last virtual address
page of other segments. */
Elf_Addr startPage = 0;
Elf_Addr firstPage = 0;
for (unsigned int i = 0; i < phdrs.size(); ++i) {
Elf_Addr thisPage = roundUp(rdi(phdrs[i].p_vaddr) + rdi(phdrs[i].p_memsz), getPageSize());
if (thisPage > startPage) startPage = thisPage;
if (rdi(phdrs[i].p_type) == PT_PHDR) firstPage = rdi(phdrs[i].p_vaddr) - rdi(phdrs[i].p_offset);
}

debug("last page is 0x%llx\n", (unsigned long long) startPage);
debug("first page is 0x%llx\n", (unsigned long long) firstPage);

/* When normalizing note segments we will in the worst case be adding
1 program header for each SHT_NOTE section. */
Expand Down Expand Up @@ -834,8 +837,9 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()
writeReplacedSections(curOff, startPage, startOffset);
assert(curOff == startOffset + neededSpace);


/* Write out the updated program and section headers */
rewriteHeaders(hdr->e_phoff);
rewriteHeaders(firstPage + hdr->e_phoff);
}


Expand Down