diff options
Diffstat (limited to 'meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch')
-rw-r--r-- | meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch b/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch new file mode 100644 index 0000000000..f64cbed5cb --- /dev/null +++ b/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | commit 1cc234fea5600190d872329aca60e2365cefc39e | ||
2 | Author: Ed Bartosh <ed.bartosh@linux.intel.com> | ||
3 | Date: Fri Jul 21 12:33:53 2017 +0300 | ||
4 | |||
5 | fix adjusting startPage | ||
6 | |||
7 | startPage is adjusted unconditionally for all executables. | ||
8 | This results in incorrect addresses assigned to INTERP and LOAD | ||
9 | program headers, which breaks patched executable. | ||
10 | |||
11 | Adjusting startPage variable only when startOffset > startPage | ||
12 | should fix this. | ||
13 | |||
14 | This change is related to the issue NixOS#10 | ||
15 | |||
16 | Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> | ||
17 | |||
18 | Github PR: https://github.com/NixOS/patchelf/pull/127 | ||
19 | |||
20 | Upstream-Status: Submitted | ||
21 | |||
22 | diff --git a/src/patchelf.cc b/src/patchelf.cc | ||
23 | index cbd36c0..e9d7ea5 100644 | ||
24 | --- a/src/patchelf.cc | ||
25 | +++ b/src/patchelf.cc | ||
26 | @@ -720,10 +720,8 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary() | ||
27 | since DYN executables tend to start at virtual address 0, so | ||
28 | rewriteSectionsExecutable() won't work because it doesn't have | ||
29 | any virtual address space to grow downwards into. */ | ||
30 | - if (isExecutable) { | ||
31 | - if (startOffset >= startPage) { | ||
32 | - debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage); | ||
33 | - } | ||
34 | + if (isExecutable && startOffset > startPage) { | ||
35 | + debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage); | ||
36 | startPage = startOffset; | ||
37 | } | ||
38 | |||