summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-04-28 11:23:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-29 07:41:44 +0100
commitdbdf9bfe206a0260984d5240537e875491aa2429 (patch)
treebc2cad0753eaa25df815f3851bed84180846152c
parenta421090cfa2bc752c8d73f6c588bc029a4a89ae7 (diff)
downloadpoky-dbdf9bfe206a0260984d5240537e875491aa2429.tar.gz
qemu: Security fix CVE-2016-2857
(From OE-Core rev: d1b972a55c59a3f3336b3ebd309532dc204ea97b) 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-2016-2857.patch51
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.5.0.bb1
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch b/meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch
new file mode 100644
index 0000000000..73cfa2a1eb
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2016-2857.patch
@@ -0,0 +1,51 @@
1From 362786f14a753d8a5256ef97d7c10ed576d6572b Mon Sep 17 00:00:00 2001
2From: Prasad J Pandit <pjp@fedoraproject.org>
3Date: Wed, 2 Mar 2016 17:29:58 +0530
4Subject: [PATCH] net: check packet payload length
5
6While computing IP checksum, 'net_checksum_calculate' reads
7payload length from the packet. It could exceed the given 'data'
8buffer size. Add a check to avoid it.
9
10Reported-by: Liu Ling <liuling-it@360.cn>
11Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
12Signed-off-by: Jason Wang <jasowang@redhat.com>
13
14Upstream-Status: Backport
15CVE: CVE-2016-2857
16
17http://git.qemu.org/?p=qemu.git;a=commit;h=362786f14a753d8a5256ef97d7c10ed576d6572b
18Signed-off-by: Armin Kuster <akuster@mvista.com>
19
20---
21 net/checksum.c | 10 ++++++++--
22 1 file changed, 8 insertions(+), 2 deletions(-)
23
24Index: qemu-2.5.0/net/checksum.c
25===================================================================
26--- qemu-2.5.0.orig/net/checksum.c
27+++ qemu-2.5.0/net/checksum.c
28@@ -59,6 +59,11 @@ void net_checksum_calculate(uint8_t *dat
29 int hlen, plen, proto, csum_offset;
30 uint16_t csum;
31
32+ /* Ensure data has complete L2 & L3 headers. */
33+ if (length < 14 + 20) {
34+ return;
35+ }
36+
37 if ((data[14] & 0xf0) != 0x40)
38 return; /* not IPv4 */
39 hlen = (data[14] & 0x0f) * 4;
40@@ -76,8 +81,9 @@ void net_checksum_calculate(uint8_t *dat
41 return;
42 }
43
44- if (plen < csum_offset+2)
45- return;
46+ if (plen < csum_offset + 2 || 14 + hlen + plen > length) {
47+ return;
48+ }
49
50 data[14+hlen+csum_offset] = 0;
51 data[14+hlen+csum_offset+1] = 0;
diff --git a/meta/recipes-devtools/qemu/qemu_2.5.0.bb b/meta/recipes-devtools/qemu/qemu_2.5.0.bb
index e9d9a8dce7..76223869b0 100644
--- a/meta/recipes-devtools/qemu/qemu_2.5.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.5.0.bb
@@ -11,6 +11,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
11 file://CVE-2016-2197.patch \ 11 file://CVE-2016-2197.patch \
12 file://CVE-2016-2198.patch \ 12 file://CVE-2016-2198.patch \
13 file://pathlimit.patch \ 13 file://pathlimit.patch \
14 file://CVE-2016-2857.patch \
14 " 15 "
15SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" 16SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
16SRC_URI[md5sum] = "f469f2330bbe76e3e39db10e9ac4f8db" 17SRC_URI[md5sum] = "f469f2330bbe76e3e39db10e9ac4f8db"