| Brad Bishop | d5ae7d9 | 2018-06-14 09:52:03 -0700 | [diff] [blame] | 1 | From 116acb2c268c89c89186673a7c92620d21825b25 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alan Modra <amodra@gmail.com> |
| 3 | Date: Wed, 28 Feb 2018 22:09:50 +1030 |
| 4 | Subject: [PATCH] PR22887, null pointer dereference in |
| 5 | aout_32_swap_std_reloc_out |
| 6 | |
| 7 | PR 22887 |
| 8 | * aoutx.h (swap_std_reloc_in): Correct r_index bound check. |
| 9 | |
| 10 | Upstream-Status: Backport |
| 11 | Affects: Binutils <= 2.30 |
| 12 | CVE: CVE-2018-7642 |
| 13 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
| 14 | |
| 15 | --- |
| 16 | bfd/ChangeLog | 5 +++++ |
| 17 | bfd/aoutx.h | 6 ++++-- |
| 18 | 2 files changed, 9 insertions(+), 2 deletions(-) |
| 19 | |
| 20 | Index: git/bfd/aoutx.h |
| 21 | =================================================================== |
| 22 | --- git.orig/bfd/aoutx.h |
| 23 | +++ git/bfd/aoutx.h |
| 24 | @@ -2284,10 +2284,12 @@ NAME (aout, swap_std_reloc_in) (bfd *abf |
| 25 | if (r_baserel) |
| 26 | r_extern = 1; |
| 27 | |
| 28 | - if (r_extern && r_index > symcount) |
| 29 | + if (r_extern && r_index >= symcount) |
| 30 | { |
| 31 | /* We could arrange to return an error, but it might be useful |
| 32 | - to see the file even if it is bad. */ |
| 33 | + to see the file even if it is bad. FIXME: Of course this |
| 34 | + means that objdump -r *doesn't* see the actual reloc, and |
| 35 | + objcopy silently writes a different reloc. */ |
| 36 | r_extern = 0; |
| 37 | r_index = N_ABS; |
| 38 | } |
| 39 | Index: git/bfd/ChangeLog |
| 40 | =================================================================== |
| 41 | --- git.orig/bfd/ChangeLog |
| 42 | +++ git/bfd/ChangeLog |
| 43 | @@ -1,3 +1,8 @@ |
| 44 | +2018-02-28 Alan Modra <amodra@gmail.com> |
| 45 | + |
| 46 | + PR 22887 |
| 47 | + * aoutx.h (swap_std_reloc_in): Correct r_index bound check. |
| 48 | + |
| 49 | 2018-02-06 Nick Clifton <nickc@redhat.com> |
| 50 | |
| 51 | PR 22794 |