NixOS/patchelf
1
0
Fork 0
mirror of https://github.com/NixOS/patchelf.git synced 2025-10-24 03:12:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'move-sections' of https://github.com/ttuegel/patchelf

Browse Source
This commit is contained in:
Eelco Dolstra
2015-07-24 01:33:34 +02:00
parent 719b4aa4c8 4e8c47fa84
commit 884413a712
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/patchelf.cc
View File

@@ -696,11 +696,22 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsExecutable()
Elf_Addr firstPage = startAddr - startOffset;
debug("first page is 0x%llx\n", (unsigned long long) firstPage);
/* Right now we assume that the section headers are somewhere near
the end, which appears to be the case most of the time.
Therefore they're not accidentally overwritten by the replaced
sections. !!! Fix this. */
assert((off_t) rdi(hdr->e_shoff) >= startOffset);
if ((off_t) rdi(hdr->e_shoff) < startOffset) {
/* The section headers occur too early in the file and would be
overwritten by the replaced sections. Move them to the end of the file
before proceeding. */
off_t shoffNew = fileSize;
off_t shSize = rdi(hdr->e_shoff) + rdi(hdr->e_shnum) * rdi(hdr->e_shentsize);
growFile (fileSize + shSize);
wri(hdr->e_shoff, shoffNew);
/* Rewrite the section header table. For neatness, keep the
sections sorted. */
assert(rdi(hdr->e_shnum) == shdrs.size());
sortShdrs();
for (unsigned int i = 1; i < rdi(hdr->e_shnum); ++i)
* ((Elf_Shdr *) (contents + rdi(hdr->e_shoff)) + i) = shdrs[i];
}
/* Compute the total space needed for the replaced sections, the