diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/CVE-2017-9039.patch | 72 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/CVE-2017-9039_1.patch | 56 |
2 files changed, 128 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-9039.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-9039.patch new file mode 100644 index 0000000000..41f2b6e316 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-9039.patch @@ -0,0 +1,72 @@ +From 75ec1fdbb797a389e4fe4aaf2e15358a070dcc19 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Mon, 3 Apr 2017 11:13:21 +0100 +Subject: [PATCH] Fix runtime seg-fault in readelf when parsing a corrupt MIPS + binary. + + PR binutils/21344 + * readelf.c (process_mips_specific): Check for an out of range GOT + entry before reading the module pointer. + +Upstream-Status: Backport +CVE: CVE-2017-9039 supporting patch +VER: <= 2.28 +Signed-off-by: Armin kuster <akuster@mvista.com> + +--- + binutils/ChangeLog | 6 ++++++ + binutils/readelf.c | 26 ++++++++++++++++++-------- + 2 files changed, 24 insertions(+), 8 deletions(-) + +Index: git/binutils/readelf.c +=================================================================== +--- git.orig/binutils/readelf.c ++++ git/binutils/readelf.c +@@ -14987,14 +14987,24 @@ process_mips_specific (FILE * file) + printf (_(" Lazy resolver\n")); + if (ent == (bfd_vma) -1) + goto got_print_fail; +- if (data +- && (byte_get (data + ent - pltgot, addr_size) +- >> (addr_size * 8 - 1)) != 0) ++ ++ if (data) + { +- ent = print_mips_got_entry (data, pltgot, ent, data_end); +- printf (_(" Module pointer (GNU extension)\n")); +- if (ent == (bfd_vma) -1) +- goto got_print_fail; ++ /* PR 21344 */ ++ if (data + ent - pltgot > data_end - addr_size) ++ { ++ error (_("Invalid got entry - %#lx - overflows GOT table\n"), ent); ++ goto got_print_fail; ++ } ++ ++ if (byte_get (data + ent - pltgot, addr_size) ++ >> (addr_size * 8 - 1) != 0) ++ { ++ ent = print_mips_got_entry (data, pltgot, ent, data_end); ++ printf (_(" Module pointer (GNU extension)\n")); ++ if (ent == (bfd_vma) -1) ++ goto got_print_fail; ++ } + } + printf ("\n"); + +Index: git/bfd/ChangeLog +=================================================================== +--- git.orig/bfd/ChangeLog ++++ git/bfd/ChangeLog +@@ -1,5 +1,11 @@ + 2017-04-03 Nick Clifton <nickc@redhat.com> + ++ PR binutils/21344 ++ * readelf.c (process_mips_specific): Check for an out of range GOT ++ entry before reading the module pointer. ++ ++2017-04-03 Nick Clifton <nickc@redhat.com> ++ + PR binutils/21343 + * readelf.c (get_unwind_section_word): Fix snafu checking for + invalid word offsets in ARM unwind information. diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-9039_1.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-9039_1.patch new file mode 100644 index 0000000000..ee827ee3e7 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-9039_1.patch @@ -0,0 +1,56 @@ +From 82156ab704b08b124d319c0decdbd48b3ca2dac5 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc@redhat.com> +Date: Mon, 3 Apr 2017 12:14:06 +0100 +Subject: [PATCH] readelf: Fix overlarge memory allocation when reading a + binary with an excessive number of program headers. + + PR binutils/21345 + * readelf.c (get_program_headers): Check for there being too many + program headers before attempting to allocate space for them. + +Upstream-Status: Backport +CVE: CVE-2017-9039 +VER: <= 2.28 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + binutils/ChangeLog | 6 ++++++ + binutils/readelf.c | 17 ++++++++++++++--- + 2 files changed, 20 insertions(+), 3 deletions(-) + +Index: git/binutils/readelf.c +=================================================================== +--- git.orig/binutils/readelf.c ++++ git/binutils/readelf.c +@@ -4705,9 +4705,19 @@ get_program_headers (FILE * file) + if (program_headers != NULL) + return 1; + +- phdrs = (Elf_Internal_Phdr *) cmalloc (elf_header.e_phnum, +- sizeof (Elf_Internal_Phdr)); ++ /* Be kind to memory checkers by looking for ++ e_phnum values which we know must be invalid. */ ++ if (elf_header.e_phnum ++ * (is_32bit_elf ? sizeof (Elf32_External_Phdr) : sizeof (Elf64_External_Phdr)) ++ >= current_file_size) ++ { ++ error (_("Too many program headers - %#x - the file is not that big\n"), ++ elf_header.e_phnum); ++ return FALSE; ++ } + ++ phdrs = (Elf_Internal_Phdr *) cmalloc (elf_header.e_phnum, ++ sizeof (Elf_Internal_Phdr)); + if (phdrs == NULL) + { + error (_("Out of memory reading %u program headers\n"), +@@ -14993,7 +15003,8 @@ process_mips_specific (FILE * file) + /* PR 21344 */ + if (data + ent - pltgot > data_end - addr_size) + { +- error (_("Invalid got entry - %#lx - overflows GOT table\n"), ent); ++ error (_("Invalid got entry - %#lx - overflows GOT table\n"), ++ (long) ent); + goto got_print_fail; + } + |