aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2017-02-17 15:59:45 +0000
committerNick Clifton <nickc@redhat.com>2017-02-17 15:59:45 +0000
commitb814a36d3440de95f2ac6eaa4fc7935c322ea456 (patch)
tree367ca498aee657afc396da5bb981d5d866afe64a /binutils
parent1b4b80bf3771dfb886687a61c541d12bfa1f1f51 (diff)
downloadgdb-b814a36d3440de95f2ac6eaa4fc7935c322ea456.zip
gdb-b814a36d3440de95f2ac6eaa4fc7935c322ea456.tar.gz
gdb-b814a36d3440de95f2ac6eaa4fc7935c322ea456.tar.bz2
Fix illegal memory accesses in readelf when parsing a corrupt binary.
PR binutils/21156 * readelf.c (find_section_in_set): Test for invalid section indicies.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/readelf.c10
2 files changed, 14 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 07c7aa9..9ae381f 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,11 @@
2017-02-17 Nick Clifton <nickc@redhat.com>
+ PR binutils/21156
+ * readelf.c (find_section_in_set): Test for invalid section
+ indicies.
+
+2017-02-17 Nick Clifton <nickc@redhat.com>
+
* readelf.c (get_section_type_name): Add decoding of GNU section
types.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index ea9da7a..20df6f8 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -676,8 +676,14 @@ find_section_in_set (const char * name, unsigned int * set)
if (set != NULL)
{
while ((i = *set++) > 0)
- if (streq (SECTION_NAME (section_headers + i), name))
- return section_headers + i;
+ {
+ /* See PR 21156 for a reproducer. */
+ if (i >= elf_header.e_shnum)
+ continue; /* FIXME: Should we issue an error message ? */
+
+ if (streq (SECTION_NAME (section_headers + i), name))
+ return section_headers + i;
+ }
}
return find_section (name);