summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2018-08-07 02:27:19 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-15 09:22:45 (GMT)
commit09d31d0806778a658b66c9d474e78bf160ede18a (patch)
treedab55fe985e520d1614dadcc28f3f9d169c8f7f5
parent8011a1aed9287f9c4c108c7ad00d1f8588aedade (diff)
downloadpoky-09d31d0806778a658b66c9d474e78bf160ede18a.tar.gz
binutls: Security fix for CVE-2017-15025
Affects: <= 2.29.1 (From OE-Core rev: b3cc9eedf3a64d4c0914b2eaf204fe38a864d238) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.29.1.inc1
-rw-r--r--meta/recipes-devtools/binutils/binutils/CVE-2017-15025.patch47
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.29.1.inc b/meta/recipes-devtools/binutils/binutils-2.29.1.inc
index 3a56e97..57e4b10 100644
--- a/meta/recipes-devtools/binutils/binutils-2.29.1.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.29.1.inc
@@ -48,6 +48,7 @@ SRC_URI = "\
48 file://CVE-2017-15022.patch \ 48 file://CVE-2017-15022.patch \
49 file://CVE-2017-15023.patch \ 49 file://CVE-2017-15023.patch \
50 file://CVE-2017-15024.patch \ 50 file://CVE-2017-15024.patch \
51 file://CVE-2017-15025.patch \
51" 52"
52S = "${WORKDIR}/git" 53S = "${WORKDIR}/git"
53 54
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-15025.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-15025.patch
new file mode 100644
index 0000000..ce53159
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-15025.patch
@@ -0,0 +1,47 @@
1From d8010d3e75ec7194a4703774090b27486b742d48 Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Sun, 24 Sep 2017 14:36:48 +0930
4Subject: [PATCH] PR22186, divide-by-zero in decode_line_info
5
6 PR 22186
7 * dwarf2.c (decode_line_info): Fail on lh.line_range of zero
8 rather than dividing by zero.
9
10Upstream-Status: Backport
11Affects: <= 2.29.1
12CVE: CVE-2017-15025
13Signed-off-by: Armin Kuster <akuster@mvista.com>
14
15---
16 bfd/ChangeLog | 6 ++++++
17 bfd/dwarf2.c | 2 ++
18 2 files changed, 8 insertions(+)
19
20Index: git/bfd/dwarf2.c
21===================================================================
22--- git.orig/bfd/dwarf2.c
23+++ git/bfd/dwarf2.c
24@@ -2432,6 +2432,8 @@ decode_line_info (struct comp_unit *unit
25 case DW_LNS_set_basic_block:
26 break;
27 case DW_LNS_const_add_pc:
28+ if (lh.line_range == 0)
29+ goto line_fail;
30 if (lh.maximum_ops_per_insn == 1)
31 address += (lh.minimum_instruction_length
32 * ((255 - lh.opcode_base) / lh.line_range));
33Index: git/bfd/ChangeLog
34===================================================================
35--- git.orig/bfd/ChangeLog
36+++ git/bfd/ChangeLog
37@@ -1,3 +1,10 @@
38+2017-09-24 Alan Modra <amodra@gmail.com>
39+
40+ PR 22186
41+ * dwarf2.c (decode_line_info): Fail on lh.line_range of zero
42+ rather than dividing by zero.
43+
44+
45 2017-09-25 Alan Modra <amodra@gmail.com>
46
47 PR 22200