diff options
author | Armin Kuster <akuster808@gmail.com> | 2017-11-26 16:12:39 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-11 22:02:58 +0000 |
commit | 9fba95a0e8798ef4bcca3221123dc3985f8fcd48 (patch) | |
tree | 38d4f063c8685ab6c803efcbae8ce230db33a414 /meta | |
parent | 436e0fc8dc8bd64cd865f27c890b26f0904bcda5 (diff) | |
download | poky-9fba95a0e8798ef4bcca3221123dc3985f8fcd48.tar.gz |
binutils: Security fix for CVE-2017-9742
Affects: <= 2.28
(From OE-Core rev: f8d6efda47b993e5e27631b9b7cd0a8638178e15)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.28.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/CVE-2017-9742.patch | 45 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.28.inc b/meta/recipes-devtools/binutils/binutils-2.28.inc index c376433564..946f16c1c0 100644 --- a/meta/recipes-devtools/binutils/binutils-2.28.inc +++ b/meta/recipes-devtools/binutils/binutils-2.28.inc | |||
@@ -54,6 +54,7 @@ SRC_URI = "\ | |||
54 | file://CVE-2017-9038_9044.patch \ | 54 | file://CVE-2017-9038_9044.patch \ |
55 | file://CVE-2017-9039.patch \ | 55 | file://CVE-2017-9039.patch \ |
56 | file://CVE-2017-9040_9042.patch \ | 56 | file://CVE-2017-9040_9042.patch \ |
57 | file://CVE-2017-9742.patch \ | ||
57 | " | 58 | " |
58 | S = "${WORKDIR}/git" | 59 | S = "${WORKDIR}/git" |
59 | 60 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-9742.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-9742.patch new file mode 100644 index 0000000000..0c9ed0d2af --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-9742.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From e64519d1ed7fd8f990f05a5562d5b5c0c44b7d7e Mon Sep 17 00:00:00 2001 | ||
2 | From: Nick Clifton <nickc@redhat.com> | ||
3 | Date: Wed, 14 Jun 2017 17:10:28 +0100 | ||
4 | Subject: [PATCH] Fix seg-fault when trying to disassemble a corrupt score | ||
5 | binary. | ||
6 | |||
7 | PR binutils/21576 | ||
8 | * score7-dis.c (score_opcodes): Add sentinel. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | CVE: CVE-2017-9742 | ||
12 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
13 | |||
14 | --- | ||
15 | opcodes/ChangeLog | 5 +++++ | ||
16 | opcodes/score7-dis.c | 3 ++- | ||
17 | 2 files changed, 7 insertions(+), 1 deletion(-) | ||
18 | |||
19 | Index: git/opcodes/score7-dis.c | ||
20 | =================================================================== | ||
21 | --- git.orig/opcodes/score7-dis.c | ||
22 | +++ git/opcodes/score7-dis.c | ||
23 | @@ -513,7 +513,8 @@ static struct score_opcode score_opcodes | ||
24 | {0x00000d05, 0x00007f0f, "tvc!"}, | ||
25 | {0x00000026, 0x3e0003ff, "xor\t\t%20-24r, %15-19r, %10-14r"}, | ||
26 | {0x00000027, 0x3e0003ff, "xor.c\t\t%20-24r, %15-19r, %10-14r"}, | ||
27 | - {0x00002007, 0x0000700f, "xor!\t\t%8-11r, %4-7r"} | ||
28 | + {0x00002007, 0x0000700f, "xor!\t\t%8-11r, %4-7r"}, | ||
29 | + { 0, 0, NULL } | ||
30 | }; | ||
31 | |||
32 | typedef struct | ||
33 | Index: git/opcodes/ChangeLog | ||
34 | =================================================================== | ||
35 | --- git.orig/opcodes/ChangeLog | ||
36 | +++ git/opcodes/ChangeLog | ||
37 | @@ -1,3 +1,8 @@ | ||
38 | +2017-06-14 Nick Clifton <nickc@redhat.com> | ||
39 | + | ||
40 | + PR binutils/21576 | ||
41 | + * score7-dis.c (score_opcodes): Add sentinel. | ||
42 | + | ||
43 | 2017-03-07 Alan Modra <amodra@gmail.com> | ||
44 | |||
45 | Apply from master | ||