summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.2.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-5.2/CVE-2016-4489.patch56
2 files changed, 57 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-5.2.inc b/meta/recipes-devtools/gcc/gcc-5.2.inc
index 2d9ba6d5cd..2e870629fb 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-5.2.inc
@@ -75,6 +75,7 @@ SRC_URI = "\
75 file://0041-handle-target-sysroot-multilib.patch \ 75 file://0041-handle-target-sysroot-multilib.patch \
76 file://0042-cxxflags-for-build.patch \ 76 file://0042-cxxflags-for-build.patch \
77 file://CVE-2016-4488.patch \ 77 file://CVE-2016-4488.patch \
78 file://CVE-2016-4489.patch \
78 " 79 "
79 80
80BACKPORTS = "" 81BACKPORTS = ""
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/CVE-2016-4489.patch b/meta/recipes-devtools/gcc/gcc-5.2/CVE-2016-4489.patch
new file mode 100644
index 0000000000..68edca4d06
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-5.2/CVE-2016-4489.patch
@@ -0,0 +1,56 @@
1From 053ec2207203a194d2ae82e2f164009aad3f14d2 Mon Sep 17 00:00:00 2001
2From: bernds <bernds@138bc75d-0d04-0410-961f-82ee72b054a4>
3Date: Fri, 8 Apr 2016 12:06:59 +0000
4Subject: [PATCH] =?UTF-8?q?Handle=20an=20overflow=20case=20(PR70498,=20pat?=
5 =?UTF-8?q?ch=20by=20Marcel=20B=C3=B6hme).?=
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10 PR c++/70498
11 * cplus-dem.c (gnu_special): Handle case where consume_count returns
12 -1.
13
14
15
16git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234828 138bc75d-0d04-0410-961f-82ee72b054a4
17
18Upstream-Status: Backport
19CVE: CVE-2016-4489
20Signed-off-by: Armin Kuster <akuster@mvista.com>
21
22---
23 libiberty/ChangeLog | 6 ++++++
24 libiberty/cplus-dem.c | 5 +++++
25 2 files changed, 11 insertions(+)
26
27Index: gcc-5.2.0/libiberty/ChangeLog
28===================================================================
29--- gcc-5.2.0.orig/libiberty/ChangeLog
30+++ gcc-5.2.0/libiberty/ChangeLog
31@@ -1,3 +1,9 @@
32+2016-04-08 Marcel Böhme <boehme.marcel@gmail.com>
33+
34+ PR c++/70498
35+ * cplus-dem.c (gnu_special): Handle case where consume_count returns
36+ -1.
37+
38 2016-03-31 Mikhail Maltsev <maltsevm@gmail.com>
39 Marcel Bohme boehme.marcel@gmail.com
40
41Index: gcc-5.2.0/libiberty/cplus-dem.c
42===================================================================
43--- gcc-5.2.0.orig/libiberty/cplus-dem.c
44+++ gcc-5.2.0/libiberty/cplus-dem.c
45@@ -3001,6 +3001,11 @@ gnu_special (struct work_stuff *work, co
46 success = 1;
47 break;
48 }
49+ else if (n == -1)
50+ {
51+ success = 0;
52+ break;
53+ }
54 }
55 else
56 {