[prev in list] [next in list] [prev in thread] [next in thread] 

List:       binutils-cvs
Subject:    [binutils-gdb/binutils-2_29-branch] Fix segfault in relocate_erratum_stub on aarch64.
From:       Cary Coutant <ccoutant () sourceware ! org>
Date:       2017-11-30 23:17:05
Message-ID: 20171130231705.20635.qmail () sourceware ! org
[Download RAW message or body]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=33130d00dc1422c5a3071d771b90dafd77e22643

commit 33130d00dc1422c5a3071d771b90dafd77e22643
Author: Peter Smith <peter.smith@linaro.org>
Date:   Thu Nov 30 13:30:58 2017 -0800

    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.

Diff:
---
 gold/ChangeLog  | 6 ++++++
 gold/aarch64.cc | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gold/ChangeLog b/gold/ChangeLog
index f421066..b02dcba 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-30  Peter Smith  <peter.smith@linaro.org>
+
+	PR gold/22233
+	* aarch64.cc (AArch64_relobj::fix_errata_and_relocate_erratum_stubs):
+	Fix calculation of stub address.
+
 2017-11-21  Ian Lance Taylor  <iant@google.com>
 
 	Apply from master:
diff --git a/gold/aarch64.cc b/gold/aarch64.cc
index b4287a6..d0839ce 100644
--- a/gold/aarch64.cc
+++ b/gold/aarch64.cc
@@ -2041,7 +2041,7 @@ AArch64_relobj<size, big_endian>::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;
[prev in list] [next in list] [prev in thread] [next in thread]