| From 6327533b1fd29fa86f6bf34e61c332c010e3c689 Mon Sep 17 00:00:00 2001 |
| From: Nick Clifton <nickc@redhat.com> |
| Date: Tue, 17 Apr 2018 14:30:07 +0100 |
| Subject: [PATCH] Add a check for a NULL table pointer before attempting to |
| compute a DWARF filename. |
| |
| PR 23065 |
| * dwarf2.c (concat_filename): Check for a NULL table pointer. |
| |
| Upstream-Status: Backport |
| Affects: Binutils <= 2.30 |
| CVE: CVE-2018-10373 |
| Signed-off-by: Armin Kuster <akuster@mvista.com> |
| |
| --- |
| bfd/ChangeLog | 5 +++++ |
| bfd/dwarf2.c | 2 +- |
| 2 files changed, 6 insertions(+), 1 deletion(-) |
| |
| Index: git/bfd/dwarf2.c |
| =================================================================== |
| --- git.orig/bfd/dwarf2.c |
| +++ git/bfd/dwarf2.c |
| @@ -1565,7 +1565,7 @@ concat_filename (struct line_info_table |
| { |
| char *filename; |
| |
| - if (file - 1 >= table->num_files) |
| + if (table == NULL || file - 1 >= table->num_files) |
| { |
| /* FILE == 0 means unknown. */ |
| if (file) |
| Index: git/bfd/ChangeLog |
| =================================================================== |
| --- git.orig/bfd/ChangeLog |
| +++ git/bfd/ChangeLog |
| @@ -1,3 +1,8 @@ |
| +2018-04-17 Nick Clifton <nickc@redhat.com> |
| + |
| + PR 23065 |
| + * dwarf2.c (concat_filename): Check for a NULL table pointer. |
| + |
| 2018-01-29 Alan Modra <amodra@gmail.com> |
| |
| PR 22741 |