aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2018-02-28 22:09:50 +1030
committerAlan Modra <amodra@gmail.com>2018-02-28 22:20:35 +1030
commit116acb2c268c89c89186673a7c92620d21825b25 (patch)
tree24ae189776c7b13cd27c0a6552906df6d2de2bbd
parent889be5dbd230ee47a90d4a83f682b13ed7e3faae (diff)
downloadgdb-116acb2c268c89c89186673a7c92620d21825b25.zip
gdb-116acb2c268c89c89186673a7c92620d21825b25.tar.gz
gdb-116acb2c268c89c89186673a7c92620d21825b25.tar.bz2
PR22887, null pointer dereference in aout_32_swap_std_reloc_out
PR 22887 * aoutx.h (swap_std_reloc_in): Correct r_index bound check.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/aoutx.h6
2 files changed, 9 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 76a6499..42cc700 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-28 Alan Modra <amodra@gmail.com>
+
+ PR 22887
+ * aoutx.h (swap_std_reloc_in): Correct r_index bound check.
+
2018-02-28 Nick Clifton <nickc@redhat.com>
PR 22894
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 4cadbfb..525e560 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -2289,10 +2289,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;
}