blob: a5322f03751c543d81b12e541fb62aecd22ac455 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From 6ac5c1350834b9da81ab90ab5ba4e5bf507c6c0d Mon Sep 17 00:00:00 2001
From: Satadru Pramanik <satadru@gmail.com>
Date: Thu, 20 May 2021 16:52:21 -0400
Subject: [PATCH] merge from PR243
Upstream-Status: Backport
Reference to upstream patch:
https://github.com/NixOS/patchelf/commit/4efbce410d00c8cb43f134181d07b364bcf78022
[OP: tweak patch to apply to patchelf v0.10]
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
[OP: tweak patch to apply to patchelf v0.12]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
src/patchelf.cc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/patchelf.cc b/src/patchelf.cc
index 1854cfa..73a3a86 100644
--- a/src/patchelf.cc
+++ b/src/patchelf.cc
@@ -774,12 +774,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. */
@@ -852,7 +855,7 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()
assert(curOff == startOffset + neededSpace);
/* Write out the updated program and section headers */
- rewriteHeaders(hdr->e_phoff);
+ rewriteHeaders(firstPage + hdr->e_phoff);
}
|
