| From ef81126314f67472a46db9581530fbf5ccb6b3f2 Mon Sep 17 00:00:00 2001 |
| From: Nick Clifton <nickc@redhat.com> |
| Date: Mon, 20 Feb 2017 14:40:39 +0000 |
| Subject: Fix another memory access error in readelf when |
| parsing a corrupt binary. |
| |
| PR binutils/21156 |
| * dwarf.c (cu_tu_indexes_read): Move into... |
| (load_cu_tu_indexes): ... here. Change the variable into |
| tri-state. Change the function into boolean, returning |
| false if the indicies could not be loaded. |
| (find_cu_tu_set): Return NULL if the indicies could not be |
| loaded. |
| |
| CVE: CVE-2017-6969 |
| Upstream-Status: Backport [master] |
| |
| Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com> |
| --- |
| binutils/ChangeLog | 10 ++++++++++ |
| binutils/dwarf.c | 34 ++++++++++++++++++++-------------- |
| 2 files changed, 30 insertions(+), 14 deletions(-) |
| |
| diff --git a/binutils/ChangeLog b/binutils/ChangeLog |
| index 1d840b42f9..53352c1801 100644 |
| --- a/binutils/ChangeLog |
| +++ b/binutils/ChangeLog |
| @@ -1,3 +1,13 @@ |
| +2017-02-20 Nick Clifton <nickc@redhat.com> |
| + |
| + PR binutils/21156 |
| + * dwarf.c (cu_tu_indexes_read): Move into... |
| + (load_cu_tu_indexes): ... here. Change the variable into |
| + tri-state. Change the function into boolean, returning |
| + false if the indicies could not be loaded. |
| + (find_cu_tu_set): Return NULL if the indicies could not be |
| + loaded. |
| + |
| 2017-02-17 Nick Clifton <nickc@redhat.com> |
| |
| PR binutils/21156 |
| diff --git a/binutils/dwarf.c b/binutils/dwarf.c |
| index 0184a7ab2e..6d879c9b61 100644 |
| --- a/binutils/dwarf.c |
| +++ b/binutils/dwarf.c |
| @@ -76,7 +76,6 @@ int dwarf_check = 0; |
| as a zero-terminated list of section indexes comprising one set of debug |
| sections from a .dwo file. */ |
| |
| -static int cu_tu_indexes_read = 0; |
| static unsigned int *shndx_pool = NULL; |
| static unsigned int shndx_pool_size = 0; |
| static unsigned int shndx_pool_used = 0; |
| @@ -99,7 +98,7 @@ static int tu_count = 0; |
| static struct cu_tu_set *cu_sets = NULL; |
| static struct cu_tu_set *tu_sets = NULL; |
| |
| -static void load_cu_tu_indexes (void *file); |
| +static bfd_boolean load_cu_tu_indexes (void *); |
| |
| /* Values for do_debug_lines. */ |
| #define FLAG_DEBUG_LINES_RAW 1 |
| @@ -2715,7 +2714,7 @@ load_debug_info (void * file) |
| return num_debug_info_entries; |
| |
| /* If this is a DWARF package file, load the CU and TU indexes. */ |
| - load_cu_tu_indexes (file); |
| + (void) load_cu_tu_indexes (file); |
| |
| if (load_debug_section (info, file) |
| && process_debug_info (&debug_displays [info].section, file, abbrev, 1, 0)) |
| @@ -7378,21 +7377,27 @@ process_cu_tu_index (struct dwarf_section *section, int do_display) |
| section sets that we can use to associate a .debug_info.dwo section |
| with its associated .debug_abbrev.dwo section in a .dwp file. */ |
| |
| -static void |
| +static bfd_boolean |
| load_cu_tu_indexes (void *file) |
| { |
| + static int cu_tu_indexes_read = -1; /* Tri-state variable. */ |
| + |
| /* If we have already loaded (or tried to load) the CU and TU indexes |
| then do not bother to repeat the task. */ |
| - if (cu_tu_indexes_read) |
| - return; |
| - |
| - if (load_debug_section (dwp_cu_index, file)) |
| - process_cu_tu_index (&debug_displays [dwp_cu_index].section, 0); |
| - |
| - if (load_debug_section (dwp_tu_index, file)) |
| - process_cu_tu_index (&debug_displays [dwp_tu_index].section, 0); |
| + if (cu_tu_indexes_read == -1) |
| + { |
| + cu_tu_indexes_read = TRUE; |
| + |
| + if (load_debug_section (dwp_cu_index, file)) |
| + if (! process_cu_tu_index (&debug_displays [dwp_cu_index].section, 0)) |
| + cu_tu_indexes_read = FALSE; |
| + |
| + if (load_debug_section (dwp_tu_index, file)) |
| + if (! process_cu_tu_index (&debug_displays [dwp_tu_index].section, 0)) |
| + cu_tu_indexes_read = FALSE; |
| + } |
| |
| - cu_tu_indexes_read = 1; |
| + return (bfd_boolean) cu_tu_indexes_read; |
| } |
| |
| /* Find the set of sections that includes section SHNDX. */ |
| @@ -7402,7 +7407,8 @@ find_cu_tu_set (void *file, unsigned int shndx) |
| { |
| unsigned int i; |
| |
| - load_cu_tu_indexes (file); |
| + if (! load_cu_tu_indexes (file)) |
| + return NULL; |
| |
| /* Find SHNDX in the shndx pool. */ |
| for (i = 0; i < shndx_pool_used; i++) |
| -- |
| 2.11.0 |
| |