packages/binutils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!128 [sync] PR-127: Fix gold linker relocation offset

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @eastb233 
Signed-off-by: @eastb233
This commit is contained in:
openeuler-ci-bot 2022-06-15 03:07:45 +00:00 committed by Gitee
commit 2fcb61a237
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Fix-gold-relocation-offset.patch Normal file
View File

@ -0,0 +1,50 @@
From e1184ff4d698dbb7eb06e2b3a25ccdc12acfa5fb Mon Sep 17 00:00:00 2001
From: wangding <wangding16@huawei.com>
Date: Wed, 8 Jun 2022 20:19:34 +0800
Subject: [PATCH] Fix gold linker relocation offset
---
gold/aarch64.cc | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gold/aarch64.cc b/gold/aarch64.cc
index 07abe44931f..05d40a383e0 100644
--- a/gold/aarch64.cc
+++ b/gold/aarch64.cc
@@ -2915,6 +2915,7 @@ class Target_aarch64 : public Sized_target<size, big_endian>
Section_id_hash> AArch64_input_section_map;
typedef AArch64_insn_utilities<big_endian> Insn_utilities;
const static int TCB_SIZE = size / 8 * 2;
+ static const Address invalid_address = static_cast<Address>(-1);
Target_aarch64(const Target::Target_info* info = &aarch64_info)
: Sized_target<size, big_endian>(info),
@@ -8285,6 +8286,25 @@ Target_aarch64<size, big_endian>::relocate_relocs(
gold_assert(sh_type == elfcpp::SHT_RELA);
+ if (offset_in_output_section == this->invalid_address) {
+ const Output_relaxed_input_section* poris =
+ output_section->find_relaxed_input_section(relinfo->object,
+ relinfo->data_shndx);
+ if (poris != NULL) {
+ Address section_address = poris->address();
+ section_size_type section_size = poris->data_size();
+
+ gold_assert((section_address >= view_address)
+ && ((section_address + section_size)
+ <= (view_address + view_size)));
+
+ off_t offset = section_address - view_address;
+ view += offset;
+ view_address += offset;
+ view_size = section_size;
+ }
+ }
+
gold::relocate_relocs<size, big_endian, Classify_reloc>(
relinfo,
prelocs,
--
2.26.0

9
binutils.spec
View File

@ -1,7 +1,7 @@
Summary: Binary utilities
Name: binutils
Version: 2.34
Release: 19
Release: 20
License: GPLv3+
URL: https://sourceware.org/binutils
@ -57,6 +57,7 @@ Patch40: backport-Fix-demangle-style-usage-info.patch
Patch41: backport-CVE-2021-45078.patch
Patch42: backport-0001-CVE-2021-42574.patch
Patch43: backport-0002-CVE-2021-42574.patch
Patch44: Fix-gold-relocation-offset.patch
Provides: bundled(libiberty)
@ -335,6 +336,12 @@ fi
%{_infodir}/bfd*info*
%changelog
* Wed Jun 8 2022 wangding <wangding16@huawei.com> - 2.34-20
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Fix gold linker relocation offset
* Wed Jan 19 2022 panxiaohe <panxiaohe@huawei.com> - 2.34-19
- Type:CVE
- ID:CVE-2021-42574