From 036aae79303c43c56b604bc215ce4a70fc2a6474 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Thu, 30 Nov 2017 13:30:58 -0800 Subject: Fix segfault in relocate_erratum_stub on aarch64. The fix for PR21868 (an internal error when --fix-cortex-a53-843419 is applied) has a small mistake in it. When the stub_owner section needs an erratum fix an incorrect address for the stubs for the section is given to relocate_erratum_stub. If we are lucky we will get a segfault; if we aren't, an incorrect patch or data corruption is possible. The error is visible in PR21868, but the side-effects aren't fatal. gold/ PR gold/22233 * aarch64.cc (AArch64_relobj::fix_errata_and_relocate_erratum_stubs): Fix calculation of stub address. --- gold/ChangeLog | 6 ++++++ gold/aarch64.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index b0014d3..49853f5 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2017-11-30 Peter Smith + + PR gold/22233 + * aarch64.cc (AArch64_relobj::fix_errata_and_relocate_erratum_stubs): + Fix calculation of stub address. + 2017-11-29 Stefan Stroe * po/Make-in (datadir): Define as @datadir@. diff --git a/gold/aarch64.cc b/gold/aarch64.cc index 4c6e920..02fabb7 100644 --- a/gold/aarch64.cc +++ b/gold/aarch64.cc @@ -2041,7 +2041,7 @@ AArch64_relobj::fix_errata_and_relocate_erratum_stubs( // executed. stub_table->relocate_erratum_stub( stub, - pview.view + view_offset + (stub_table->address() - pview.address)); + pview.view + (stub_table->address() - pview.address)); // Next erratum stub. ++p; -- cgit v1.1