diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.28.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/CVE-2017-9755.patch | 63 |
2 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.28.inc b/meta/recipes-devtools/binutils/binutils-2.28.inc index c6ef6478aa..b4299c8897 100644 --- a/meta/recipes-devtools/binutils/binutils-2.28.inc +++ b/meta/recipes-devtools/binutils/binutils-2.28.inc | |||
@@ -65,6 +65,7 @@ SRC_URI = "\ | |||
65 | file://CVE-2017-9751.patch \ | 65 | file://CVE-2017-9751.patch \ |
66 | file://CVE-2017-9752.patch \ | 66 | file://CVE-2017-9752.patch \ |
67 | file://CVE-2017-9753.patch \ | 67 | file://CVE-2017-9753.patch \ |
68 | file://CVE-2017-9755.patch \ | ||
68 | " | 69 | " |
69 | S = "${WORKDIR}/git" | 70 | S = "${WORKDIR}/git" |
70 | 71 | ||
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-9755.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-9755.patch new file mode 100644 index 0000000000..15dc9090d8 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-9755.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | From 0d96e4df4812c3bad77c229dfef47a9bc115ac12 Mon Sep 17 00:00:00 2001 | ||
2 | From: "H.J. Lu" <hjl.tools@gmail.com> | ||
3 | Date: Thu, 15 Jun 2017 06:40:17 -0700 | ||
4 | Subject: [PATCH] i386-dis: Check valid bnd register | ||
5 | |||
6 | Since there are only 4 bnd registers, return "(bad)" for register | ||
7 | number > 3. | ||
8 | |||
9 | PR binutils/21594 | ||
10 | * i386-dis.c (OP_E_register): Check valid bnd register. | ||
11 | (OP_G): Likewise. | ||
12 | |||
13 | Upstream-Status: Backport | ||
14 | CVE: CVE-2017-9755 | ||
15 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
16 | |||
17 | --- | ||
18 | opcodes/ChangeLog | 6 ++++++ | ||
19 | opcodes/i386-dis.c | 10 ++++++++++ | ||
20 | 2 files changed, 16 insertions(+) | ||
21 | |||
22 | Index: git/opcodes/ChangeLog | ||
23 | =================================================================== | ||
24 | --- git.orig/opcodes/ChangeLog | ||
25 | +++ git/opcodes/ChangeLog | ||
26 | @@ -1,3 +1,9 @@ | ||
27 | +2017-06-15 H.J. Lu <hongjiu.lu@intel.com> | ||
28 | + | ||
29 | + PR binutils/21594 | ||
30 | + * i386-dis.c (OP_E_register): Check valid bnd register. | ||
31 | + (OP_G): Likewise. | ||
32 | + | ||
33 | 2017-06-15 Nick Clifton <nickc@redhat.com> | ||
34 | |||
35 | PR binutils/21588 | ||
36 | Index: git/opcodes/i386-dis.c | ||
37 | =================================================================== | ||
38 | --- git.orig/opcodes/i386-dis.c | ||
39 | +++ git/opcodes/i386-dis.c | ||
40 | @@ -14939,6 +14939,11 @@ OP_E_register (int bytemode, int sizefla | ||
41 | names = address_mode == mode_64bit ? names64 : names32; | ||
42 | break; | ||
43 | case bnd_mode: | ||
44 | + if (reg > 0x3) | ||
45 | + { | ||
46 | + oappend ("(bad)"); | ||
47 | + return; | ||
48 | + } | ||
49 | names = names_bnd; | ||
50 | break; | ||
51 | case indir_v_mode: | ||
52 | @@ -15483,6 +15488,11 @@ OP_G (int bytemode, int sizeflag) | ||
53 | oappend (names64[modrm.reg + add]); | ||
54 | break; | ||
55 | case bnd_mode: | ||
56 | + if (modrm.reg > 0x3) | ||
57 | + { | ||
58 | + oappend ("(bad)"); | ||
59 | + return; | ||
60 | + } | ||
61 | oappend (names_bnd[modrm.reg]); | ||
62 | break; | ||
63 | case v_mode: | ||