summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2017-11-26 16:31:27 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-11 22:02:59 +0000
commit3f098a0f6e1ecc840291c9d3a11e10ec1647a36e (patch)
treecfa065a91c0c060c33f1d878e55835e449b1fc1a
parente6b8c7e0983691ae4b730864aade6ef83554d740 (diff)
downloadpoky-3f098a0f6e1ecc840291c9d3a11e10ec1647a36e.tar.gz
binutls: Security fix for CVE-2017-9755
Affects: <= 2.28 (From OE-Core rev: 2a1da95cf865de024d278178b28e58a299526121) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.28.inc1
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2017-9755.patch63
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"
69S = "${WORKDIR}/git" 70S = "${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 @@
1From 0d96e4df4812c3bad77c229dfef47a9bc115ac12 Mon Sep 17 00:00:00 2001
2From: "H.J. Lu" <hjl.tools@gmail.com>
3Date: Thu, 15 Jun 2017 06:40:17 -0700
4Subject: [PATCH] i386-dis: Check valid bnd register
5
6Since there are only 4 bnd registers, return "(bad)" for register
7number > 3.
8
9 PR binutils/21594
10 * i386-dis.c (OP_E_register): Check valid bnd register.
11 (OP_G): Likewise.
12
13Upstream-Status: Backport
14CVE: CVE-2017-9755
15Signed-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
22Index: 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
36Index: 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: