From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 18 Nov 2014 19:34:11 +0000 (-0800)
Subject: Check PC-relative offset overflow in PLT entry
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d585188889de38c7191976051d9acdd8d57cbbf;p=binutils-gdb.git

Check PC-relative offset overflow in PLT entry

	PR gold/17619
	* x86_64.cc (Output_data_plt_x86_64_standard<size>::do_fill_plt_entry):
	Check PC-relative offset overflow in PLT entry.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 66c7fca37b0..73e601d8ba0 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR gold/17619
+	* x86_64.cc (Output_data_plt_x86_64_standard<size>::do_fill_plt_entry):
+	Check PC-relative offset overflow in PLT entry.
+
 2014-11-21  Alan Modra  <amodra@gmail.com>
 
 	* powerpc.cc (Target_powerpc::Relocate::relocate): Correct test
diff --git a/gold/x86_64.cc b/gold/x86_64.cc
index 1fb601d30fb..4baa2bf8eeb 100644
--- a/gold/x86_64.cc
+++ b/gold/x86_64.cc
@@ -1516,11 +1516,16 @@ Output_data_plt_x86_64_standard<size>::do_fill_plt_entry(
     unsigned int plt_offset,
     unsigned int plt_index)
 {
+  // Check PC-relative offset overflow in PLT entry.
+  uint64_t plt_got_pcrel_offset = (got_address + got_offset
+				   - (plt_address + plt_offset + 6));
+  if (Bits<32>::has_overflow(plt_got_pcrel_offset))
+    gold_error(_("PC-relative offset overflow in PLT entry %d"),
+	       plt_index + 1);
+
   memcpy(pov, plt_entry, plt_entry_size);
   elfcpp::Swap_unaligned<32, false>::writeval(pov + 2,
-					      (got_address + got_offset
-					       - (plt_address + plt_offset
-						  + 6)));
+					      plt_got_pcrel_offset);
 
   elfcpp::Swap_unaligned<32, false>::writeval(pov + 7, plt_index);
   elfcpp::Swap<32, false>::writeval(pov + 12,