From 015ad9b28fa30ce3f55af36f82def51da8d5eca5 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Wed, 21 Jun 2017 11:22:35 -0700 Subject: binutils: Security fix for CVE-2017-9040 and 2017-9042 Source: binutils-gdb.git MR: 72756, 72805 Type: Security Fix Disposition: Backport from https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=7296a62a2a237f6b1ad8db8c38b090e9f592c8cf ChangeID: af83ec9e8322e0e051bb684bd2fee5fe8a506fbc Description: excluded some changes as the code does not exist in our version. Does not affect fix. Affects: <= Binutils 2017-04-12 Signed-off-by: Armin Kuster Reviewed-by Jeremy Puhlman Signed-off-by: Armin Kuster Signed-off-by: Armin Kuster --- meta/recipes-devtools/binutils/binutils-2.27.inc | 1 + .../binutils/binutils/CVE-2017-9040_and_9042.patch | 83 ++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2017-9040_and_9042.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.27.inc b/meta/recipes-devtools/binutils/binutils-2.27.inc index eefb2e7031..53c09e6d0d 100644 --- a/meta/recipes-devtools/binutils/binutils-2.27.inc +++ b/meta/recipes-devtools/binutils/binutils-2.27.inc @@ -49,6 +49,7 @@ SRC_URI = "\ file://CVE-2017-9038.patch \ file://CVE-2017-9039.patch \ file://CVE-2017-9039_1.patch \ + file://CVE-2017-9040_and_9042.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-9040_and_9042.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-9040_and_9042.patch new file mode 100644 index 0000000000..d5089035e1 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-9040_and_9042.patch @@ -0,0 +1,83 @@ +From 7296a62a2a237f6b1ad8db8c38b090e9f592c8cf Mon Sep 17 00:00:00 2001 +From: Nick Clifton +Date: Thu, 13 Apr 2017 16:06:30 +0100 +Subject: [PATCH] readelf: fix out of range subtraction, seg fault from a NULL + pointer and memory exhaustion, all from parsing corrupt binaries. + + PR binutils/21379 + * readelf.c (process_dynamic_section): Detect over large section + offsets in the DT_SYMTAB entry. + + PR binutils/21345 + * readelf.c (process_mips_specific): Catch an unfeasible memory + allocation before it happens and print a suitable error message. + +Upstream-Status: Backport + +did not include all the commit as affect code does not exists. it does contain the two +fixes above. +both cve's fixed by same comit. + +CVE: CVE-2017-9040 +CVE: CVE-2017-9042 +VER: <= 2.28 +Signed-off-by: Armin Kuster + +--- + binutils/ChangeLog | 12 ++++++++++++ + binutils/readelf.c | 26 +++++++++++++++++++++----- + 2 files changed, 33 insertions(+), 5 deletions(-) + +Index: git/binutils/readelf.c +=================================================================== +--- git.orig/binutils/readelf.c ++++ git/binutils/readelf.c +@@ -9079,6 +9079,12 @@ process_dynamic_section (FILE * file) + processing that. This is overkill, I know, but it + should work. */ + section.sh_offset = offset_from_vma (file, entry->d_un.d_val, 0); ++ if ((bfd_size_type) section.sh_offset > current_file_size) ++ { ++ /* See PR 21379 for a reproducer. */ ++ error (_("Invalid DT_SYMTAB entry: %lx"), (long) section.sh_offset); ++ return FALSE; ++ } + + if (archive_file_offset != 0) + section.sh_size = archive_file_size - section.sh_offset; +@@ -14882,6 +14888,15 @@ process_mips_specific (FILE * file) + return 0; + } + ++ /* PR 21345 - print a slightly more helpful error message ++ if we are sure that the cmalloc will fail. */ ++ if (conflictsno * sizeof (* iconf) > current_file_size) ++ { ++ error (_("Overlarge number of conflicts detected: %lx\n"), ++ (long) conflictsno); ++ return FALSE; ++ } ++ + iconf = (Elf32_Conflict *) cmalloc (conflictsno, sizeof (* iconf)); + if (iconf == NULL) + { +Index: git/bfd/ChangeLog +=================================================================== +--- git.orig/bfd/ChangeLog ++++ git/bfd/ChangeLog +@@ -1,3 +1,15 @@ ++2017-04-13 Nick Clifton ++ ++ PR binutils/21379 ++ * readelf.c (process_dynamic_section): Detect over large section ++ offsets in the DT_SYMTAB entry. ++ ++2017-04-13 Nick Clifton ++ ++ PR binutils/21345 ++ * readelf.c (process_mips_specific): Catch an unfeasible memory ++ allocation before it happens and print a suitable error message. ++ + 2017-04-03 Nick Clifton + + PR binutils/21345 -- cgit 1.2.3-korg