mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

patchelf: Backport fix from upstream for note section overlap error

Browse Source 
Backport a patch from upstream to fix an error:
patchelf: cannot normalize PT_NOTE segment: non-contiguous SHT_NOTE sections

seen on our ubuntu1604 autobuilder worker.

(From OE-Core rev: 80e8f7d34d7032cc94b61bf155eac7648e6b6c74)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-04-20 15:13:53 +01:00
parent c365e38233
commit 63b0992ab7
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
meta/recipes-devtools/patchelf/patchelf/6edec83653ce1b5fc201ff6db93b966394766814.patch Normal file
View File

@@ -0,0 +1,44 @@
From 6edec83653ce1b5fc201ff6db93b966394766814 Mon Sep 17 00:00:00 2001
From: rmnull <rmnull@users.noreply.github.com>
Date: Tue, 18 Aug 2020 20:22:52 +0530
Subject: [PATCH] mark phdrs synced with sections, avoid rechecking it when
syncing note sections to segments.
This also serves as a bug fix when a previously synced note segment
overlaps with another section and creates a false alarm.
Upstream-Status: Backport
---
src/patchelf.cc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/patchelf.cc b/src/patchelf.cc
index 05ec793..622f0b6 100644
--- a/src/patchelf.cc
+++ b/src/patchelf.cc
@@ -669,6 +669,7 @@ void ElfFile<ElfFileParamNames>::writeReplacedSections(Elf_Off & curOff,
memset(contents + rdi(shdr.sh_offset), 'X', rdi(shdr.sh_size));
}
+ std::set<unsigned int> noted_phdrs = {};
for (auto & i : replacedSections) {
std::string sectionName = i.first;
auto & shdr = findSection(sectionName);
@@ -721,7 +722,7 @@ void ElfFile<ElfFileParamNames>::writeReplacedSections(Elf_Off & curOff,
shdr.sh_addralign = orig_shdr.sh_addralign;
for (unsigned int j = 0; j < phdrs.size(); ++j)
- if (rdi(phdrs[j].p_type) == PT_NOTE) {
+ if (rdi(phdrs[j].p_type) == PT_NOTE && noted_phdrs.find(j) == noted_phdrs.end()) {
Elf_Off p_start = rdi(phdrs[j].p_offset);
Elf_Off p_end = p_start + rdi(phdrs[j].p_filesz);
Elf_Off s_start = rdi(orig_shdr.sh_offset);
@@ -739,6 +740,8 @@ void ElfFile<ElfFileParamNames>::writeReplacedSections(Elf_Off & curOff,
phdrs[j].p_offset = shdr.sh_offset;
phdrs[j].p_vaddr = phdrs[j].p_paddr = shdr.sh_addr;
phdrs[j].p_filesz = phdrs[j].p_memsz = shdr.sh_size;
+
+ noted_phdrs.insert(j);
}
}

1
meta/recipes-devtools/patchelf/patchelf_0.12.bb
View File

@@ -6,6 +6,7 @@ LICENSE = "GPLv3"
SRC_URI = "git://github.com/NixOS/patchelf;protocol=https \
file://handle-read-only-files.patch \
file://6edec83653ce1b5fc201ff6db93b966394766814.patch \
"
SRCREV = "8d3a16e97294e3c5521c61b4c8835499c9918264"