summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-02-06 23:14:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-07 17:23:04 (GMT)
commit73941fbc6a1642b4d036135ac97731aaf98e27e8 (patch)
tree8561e09aa01c38a3aa87a9634f3a691ed061fa6d
parent4d3ce521947088a71ce4b3b7291f79af881c4d56 (diff)
downloadpoky-73941fbc6a1642b4d036135ac97731aaf98e27e8.tar.gz
qemu: Security fix CVE-2015-8504
CVE-2015-8504 Qemu: ui: vnc: avoid floating point exception (From OE-Core rev: c622bdd7133d31d7fbefe87fb38187f0aea4b592) (From OE-Core rev: 38f102a9271896a49aa32aacf2c2be3a14f51493) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu/CVE-2015-8504.patch51
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.2.0.bb1
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2015-8504.patch b/meta/recipes-devtools/qemu/qemu/CVE-2015-8504.patch
new file mode 100644
index 0000000..2e6c897
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2015-8504.patch
@@ -0,0 +1,51 @@
1From 4c65fed8bdf96780735dbdb92a8bd0d6b6526cc3 Mon Sep 17 00:00:00 2001
2From: Prasad J Pandit <pjp@fedoraproject.org>
3Date: Thu, 3 Dec 2015 18:54:17 +0530
4Subject: [PATCH] ui: vnc: avoid floating point exception
5
6While sending 'SetPixelFormat' messages to a VNC server,
7the client could set the 'red-max', 'green-max' and 'blue-max'
8values to be zero. This leads to a floating point exception in
9write_png_palette while doing frame buffer updates.
10
11Reported-by: Lian Yihan <lianyihan@360.cn>
12Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
13Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
14Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
15
16Upstream-Status: Backport
17
18http://git.qemu.org/?p=qemu.git;a=commitdiff;h=4c65fed8bdf96780735dbdb92a8
19
20CVE: CVE-2015-8504
21[Yocto # 9013]
22
23Signed-off-by: Armin Kuster <akuster@mvista.com>
24
25---
26 ui/vnc.c | 6 +++---
27 1 file changed, 3 insertions(+), 3 deletions(-)
28
29Index: qemu-2.2.0/ui/vnc.c
30===================================================================
31--- qemu-2.2.0.orig/ui/vnc.c
32+++ qemu-2.2.0/ui/vnc.c
33@@ -2036,15 +2036,15 @@ static void set_pixel_format(VncState *v
34 return;
35 }
36
37- vs->client_pf.rmax = red_max;
38+ vs->client_pf.rmax = red_max ? red_max : 0xFF;
39 vs->client_pf.rbits = hweight_long(red_max);
40 vs->client_pf.rshift = red_shift;
41 vs->client_pf.rmask = red_max << red_shift;
42- vs->client_pf.gmax = green_max;
43+ vs->client_pf.gmax = green_max ? green_max : 0xFF;
44 vs->client_pf.gbits = hweight_long(green_max);
45 vs->client_pf.gshift = green_shift;
46 vs->client_pf.gmask = green_max << green_shift;
47- vs->client_pf.bmax = blue_max;
48+ vs->client_pf.bmax = blue_max ? blue_max : 0xFF;
49 vs->client_pf.bbits = hweight_long(blue_max);
50 vs->client_pf.bshift = blue_shift;
51 vs->client_pf.bmask = blue_max << blue_shift;
diff --git a/meta/recipes-devtools/qemu/qemu_2.2.0.bb b/meta/recipes-devtools/qemu/qemu_2.2.0.bb
index 4c6880b..eaf8daf 100644
--- a/meta/recipes-devtools/qemu/qemu_2.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.2.0.bb
@@ -20,6 +20,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
20 file://10-xen-pt-add-a-few-PCI-config-space-field-descriptions-CVE-2015-4106.patch \ 20 file://10-xen-pt-add-a-few-PCI-config-space-field-descriptions-CVE-2015-4106.patch \
21 file://11-xen-pt-unknown-PCI-config-space-fields-should-be-readonly-CVE-2015-4106.patch \ 21 file://11-xen-pt-unknown-PCI-config-space-fields-should-be-readonly-CVE-2015-4106.patch \
22 file://qemu-fix-CVE-2015-3209.patch \ 22 file://qemu-fix-CVE-2015-3209.patch \
23 file://CVE-2015-8504.patch \
23 " 24 "
24SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" 25SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
25SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8" 26SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8"