diff options
Diffstat (limited to 'meta/recipes-devtools/qemu')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/CVE-2015-7512.patch | 44 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_2.4.0.bb | 1 |
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 0000000000..50b8a6cee8 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2015-7512.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 8b98a2f07175d46c3f7217639bd5e03f2ec56343 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jason Wang <jasowang@redhat.com> | ||
3 | Date: Mon, 30 Nov 2015 15:00:06 +0800 | ||
4 | Subject: [PATCH] pcnet: fix rx buffer overflow(CVE-2015-7512) | ||
5 | |||
6 | Backends could provide a packet whose length is greater than buffer | ||
7 | size. Check for this and truncate the packet to avoid rx buffer | ||
8 | overflow in this case. | ||
9 | |||
10 | Cc: Prasad J Pandit <pjp@fedoraproject.org> | ||
11 | Cc: qemu-stable@nongnu.org | ||
12 | Reviewed-by: Michael S. Tsirkin <mst@redhat.com> | ||
13 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
14 | |||
15 | Upsteam_Status: Backport | ||
16 | |||
17 | http://git.qemu.org/?p=qemu.git;a=commit;h=8b98a2f07175d46c3f7217639bd5e03f2ec56343 | ||
18 | |||
19 | CVE: CVE-2015-7512 | ||
20 | [Yocto # 9013] | ||
21 | |||
22 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
23 | |||
24 | --- | ||
25 | hw/net/pcnet.c | 6 ++++++ | ||
26 | 1 file changed, 6 insertions(+) | ||
27 | |||
28 | Index: qemu-2.4.0/hw/net/pcnet.c | ||
29 | =================================================================== | ||
30 | --- qemu-2.4.0.orig/hw/net/pcnet.c | ||
31 | +++ qemu-2.4.0/hw/net/pcnet.c | ||
32 | @@ -1065,6 +1065,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.4.0.bb b/meta/recipes-devtools/qemu/qemu_2.4.0.bb index 58ce3b59de..b5c717c8e1 100644 --- a/meta/recipes-devtools/qemu/qemu_2.4.0.bb +++ b/meta/recipes-devtools/qemu/qemu_2.4.0.bb | |||
@@ -12,6 +12,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ | |||
12 | file://no-valgrind.patch \ | 12 | file://no-valgrind.patch \ |
13 | file://CVE-2015-8504.patch \ | 13 | file://CVE-2015-8504.patch \ |
14 | file://CVE-2015-7504.patch \ | 14 | file://CVE-2015-7504.patch \ |
15 | file://CVE-2015-7512.patch \ | ||
15 | " | 16 | " |
16 | SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" | 17 | SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" |
17 | SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4" | 18 | SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4" |