From: Matthias Klose <doko@debian.org>
Date: Sun, 18 Mar 2018 04:51:40 +0000 (+0000)
Subject: pr22887
X-Git-Tag: archive/raspbian/2.30-8+rpi1^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=79b9dfbc735495792a04145265c506bdbe8e06ea;p=binutils.git

pr22887

# DP: PR22887, null pointer dereference in aout_32_swap_std_reloc_out

From 116acb2c268c89c89186673a7c92620d21825b25 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Wed, 28 Feb 2018 22:09:50 +1030
Subject: [PATCH] PR22887, null pointer dereference in
 aout_32_swap_std_reloc_out

	PR 22887
	* aoutx.h (swap_std_reloc_in): Correct r_index bound check.

Gbp-Pq: Name pr22887.diff
---

diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index eec9c4ad2..8abaeb9e1 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -2283,10 +2283,12 @@ NAME (aout, swap_std_reloc_in) (bfd *abfd,
   if (r_baserel)
     r_extern = 1;
 
-  if (r_extern && r_index > symcount)
+  if (r_extern && r_index >= symcount)
     {
       /* We could arrange to return an error, but it might be useful
-	 to see the file even if it is bad.  */
+	 to see the file even if it is bad.  FIXME: Of course this
+	 means that objdump -r *doesn't* see the actual reloc, and
+	 objcopy silently writes a different reloc.  */
       r_extern = 0;
       r_index = N_ABS;
     }