summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-02-06 23:14:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-07 17:23:05 (GMT)
commit05f4812d15d7816da7e50337792e98f01fbfd103 (patch)
tree68cc2db5b158c12dbb6ca21e0b5203e600338636
parentcaa104fd2a94f52b06b14f4d096a7bacf79308b8 (diff)
downloadpoky-05f4812d15d7816da7e50337792e98f01fbfd103.tar.gz
qemu: Security fix CVE-2015-7512
CVE-2015-7512 Qemu: net: pcnet: buffer overflow in non-loopback mod (From OE-Core rev: e6e9be51f77c9531f49cebe0ca6b495c23cf022d) (From OE-Core rev: 90d2a8eb0853f506a457e9935f4354c71d2fc9c9) 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-7512.patch44
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.2.0.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2015-7512.patch b/meta/recipes-devtools/qemu/qemu/CVE-2015-7512.patch
new file mode 100644
index 0000000..9b4cf14
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2015-7512.patch
@@ -0,0 +1,44 @@
1From 8b98a2f07175d46c3f7217639bd5e03f2ec56343 Mon Sep 17 00:00:00 2001
2From: Jason Wang <jasowang@redhat.com>
3Date: Mon, 30 Nov 2015 15:00:06 +0800
4Subject: [PATCH] pcnet: fix rx buffer overflow(CVE-2015-7512)
5
6Backends could provide a packet whose length is greater than buffer
7size. Check for this and truncate the packet to avoid rx buffer
8overflow in this case.
9
10Cc: Prasad J Pandit <pjp@fedoraproject.org>
11Cc: qemu-stable@nongnu.org
12Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
13Signed-off-by: Jason Wang <jasowang@redhat.com>
14
15Upsteam_Status: Backport
16
17http://git.qemu.org/?p=qemu.git;a=commit;h=8b98a2f07175d46c3f7217639bd5e03f2ec56343
18
19CVE: CVE-2015-7512
20[Yocto # 9013]
21
22Signed-off-by: Armin Kuster <akuster@mvista.com>
23
24---
25 hw/net/pcnet.c | 6 ++++++
26 1 file changed, 6 insertions(+)
27
28Index: qemu-2.2.0/hw/net/pcnet.c
29===================================================================
30--- qemu-2.2.0.orig/hw/net/pcnet.c
31+++ qemu-2.2.0/hw/net/pcnet.c
32@@ -1086,6 +1086,12 @@ ssize_t pcnet_receive(NetClientState *nc
33 int pktcount = 0;
34
35 if (!s->looptest) {
36+ if (size > 4092) {
37+#ifdef PCNET_DEBUG_RMD
38+ fprintf(stderr, "pcnet: truncates rx packet.\n");
39+#endif
40+ size = 4092;
41+ }
42 memcpy(src, buf, size);
43 /* no need to compute the CRC */
44 src[size] = 0;
diff --git a/meta/recipes-devtools/qemu/qemu_2.2.0.bb b/meta/recipes-devtools/qemu/qemu_2.2.0.bb
index bb27034..950917e 100644
--- a/meta/recipes-devtools/qemu/qemu_2.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.2.0.bb
@@ -22,6 +22,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
22 file://qemu-fix-CVE-2015-3209.patch \ 22 file://qemu-fix-CVE-2015-3209.patch \
23 file://CVE-2015-8504.patch \ 23 file://CVE-2015-8504.patch \
24 file://CVE-2015-7504.patch \ 24 file://CVE-2015-7504.patch \
25 file://CVE-2015-7512.patch \
25 " 26 "
26SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" 27SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
27SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8" 28SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8"