From c434d950cd3a12da773c1cf3c773ba26fbcb88f5 Mon Sep 17 00:00:00 2001 From: Thiruvadi Rajaraman Date: Mon, 4 Sep 2017 13:52:14 +0530 Subject: binutils: CVE-2017-7223 Source: git://sourceware.org/git/binutils-gdb.git MR: 74322 Type: Security Fix Disposition: Backport from binutils-2_29-branch ChangeID: c7e14cdaab09996e736a6294834d3470ac9ddb6c Description: Fix seg fault attempting to unget an EOF character. PR gas/20898 * app.c (do_scrub_chars): Do not attempt to unget EOF. Affects: <= 2.29 Signed-off-by: Thiruvadi Rajaraman Reviewed-by: Armin Kuster Signed-off-by: Armin Kuster Signed-off-by: Armin Kuster --- meta/recipes-devtools/binutils/binutils-2.27.inc | 1 + .../binutils/binutils/CVE-2017-7223.patch | 40 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2017-7223.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.27.inc b/meta/recipes-devtools/binutils/binutils-2.27.inc index 3b7c9f776b..06c69b9f66 100644 --- a/meta/recipes-devtools/binutils/binutils-2.27.inc +++ b/meta/recipes-devtools/binutils/binutils-2.27.inc @@ -59,6 +59,7 @@ SRC_URI = "\ file://CVE-2017-12451.patch \ file://CVE-2017-12450_12452_12453_12454_12456_1.patch \ file://CVE-2017-12450_12452_12453_12454_12456.patch \ + file://CVE-2017-7223.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-7223.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-7223.patch new file mode 100644 index 0000000000..eb9fc6f36c --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-7223.patch @@ -0,0 +1,40 @@ +commit 69ace2200106348a1b00d509a6a234337c104c17 +Author: Nick Clifton +Date: Thu Dec 1 15:20:19 2016 +0000 + + Fix seg fault attempting to unget an EOF character. + + PR gas/20898 + * app.c (do_scrub_chars): Do not attempt to unget EOF. + +Upstream-Status: backport + +CVE: CVE-2017-7223 +Signed-off-by: Thiruvadi Rajaraman + +Index: git/gas/ChangeLog +=================================================================== +--- git.orig/gas/ChangeLog 2017-09-04 12:42:08.941602299 +0530 ++++ git/gas/ChangeLog 2017-09-04 12:48:28.863820763 +0530 +@@ -1,3 +1,8 @@ ++2016-12-01 Nick Clifton ++ ++ PR gas/20898 ++ * app.c (do_scrub_chars): Do not attempt to unget EOF. ++ + 2016-08-05 Nick Clifton + + PR gas/20364 +Index: git/gas/app.c +=================================================================== +--- git.orig/gas/app.c 2017-09-04 12:42:05.261580103 +0530 ++++ git/gas/app.c 2017-09-04 12:47:19.923428673 +0530 +@@ -1187,7 +1187,7 @@ + state = -2; + break; + } +- else ++ else if (ch2 != EOF) + { + UNGET (ch2); + } -- cgit 1.2.3-korg