diff options
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.27.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/CVE-2017-7223.patch | 40 |
2 files changed, 41 insertions, 0 deletions
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 = "\ | |||
59 | file://CVE-2017-12451.patch \ | 59 | file://CVE-2017-12451.patch \ |
60 | file://CVE-2017-12450_12452_12453_12454_12456_1.patch \ | 60 | file://CVE-2017-12450_12452_12453_12454_12456_1.patch \ |
61 | file://CVE-2017-12450_12452_12453_12454_12456.patch \ | 61 | file://CVE-2017-12450_12452_12453_12454_12456.patch \ |
62 | file://CVE-2017-7223.patch \ | ||
62 | " | 63 | " |
63 | S = "${WORKDIR}/git" | 64 | S = "${WORKDIR}/git" |
64 | 65 | ||
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 @@ | |||
1 | commit 69ace2200106348a1b00d509a6a234337c104c17 | ||
2 | Author: Nick Clifton <nickc@redhat.com> | ||
3 | Date: Thu Dec 1 15:20:19 2016 +0000 | ||
4 | |||
5 | Fix seg fault attempting to unget an EOF character. | ||
6 | |||
7 | PR gas/20898 | ||
8 | * app.c (do_scrub_chars): Do not attempt to unget EOF. | ||
9 | |||
10 | Upstream-Status: backport | ||
11 | |||
12 | CVE: CVE-2017-7223 | ||
13 | Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com> | ||
14 | |||
15 | Index: git/gas/ChangeLog | ||
16 | =================================================================== | ||
17 | --- git.orig/gas/ChangeLog 2017-09-04 12:42:08.941602299 +0530 | ||
18 | +++ git/gas/ChangeLog 2017-09-04 12:48:28.863820763 +0530 | ||
19 | @@ -1,3 +1,8 @@ | ||
20 | +2016-12-01 Nick Clifton <nickc@redhat.com> | ||
21 | + | ||
22 | + PR gas/20898 | ||
23 | + * app.c (do_scrub_chars): Do not attempt to unget EOF. | ||
24 | + | ||
25 | 2016-08-05 Nick Clifton <nickc@redhat.com> | ||
26 | |||
27 | PR gas/20364 | ||
28 | Index: git/gas/app.c | ||
29 | =================================================================== | ||
30 | --- git.orig/gas/app.c 2017-09-04 12:42:05.261580103 +0530 | ||
31 | +++ git/gas/app.c 2017-09-04 12:47:19.923428673 +0530 | ||
32 | @@ -1187,7 +1187,7 @@ | ||
33 | state = -2; | ||
34 | break; | ||
35 | } | ||
36 | - else | ||
37 | + else if (ch2 != EOF) | ||
38 | { | ||
39 | UNGET (ch2); | ||
40 | } | ||