summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2018-08-15 15:25:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-16 22:40:28 +0100
commite00b4617797ce89865a6f8318b6abedcddae3046 (patch)
treedd205f53a05d81d3a596e94815596b4b2d363ce1
parentf7de037dcaa055cfdbf670026d3cde69e76a40ea (diff)
downloadpoky-e00b4617797ce89865a6f8318b6abedcddae3046.tar.gz
qemu: Upgrade QEMU 2.12 -> 3.0
(From OE-Core rev: 4e37ca369205dccfaf730d6ac4d33c23fb995b5f) Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-CVE-2018-11806-QEMU-slirp-heap-buffer-overflow.patch70
-rw-r--r--meta/recipes-devtools/qemu/qemu_3.0.0.bb (renamed from meta/recipes-devtools/qemu/qemu_2.12.0.bb)7
3 files changed, 4 insertions, 75 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index bed1594b7a..1c9226cb06 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -28,7 +28,7 @@ BINUVERSION ?= "2.31%"
28GDBVERSION ?= "8.1%" 28GDBVERSION ?= "8.1%"
29GLIBCVERSION ?= "2.28%" 29GLIBCVERSION ?= "2.28%"
30LINUXLIBCVERSION ?= "4.15%" 30LINUXLIBCVERSION ?= "4.15%"
31QEMUVERSION ?= "2.12%" 31QEMUVERSION ?= "3.0%"
32 32
33PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 33PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
34PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" 34PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/qemu/qemu/0001-CVE-2018-11806-QEMU-slirp-heap-buffer-overflow.patch b/meta/recipes-devtools/qemu/qemu/0001-CVE-2018-11806-QEMU-slirp-heap-buffer-overflow.patch
deleted file mode 100644
index 837b65a79a..0000000000
--- a/meta/recipes-devtools/qemu/qemu/0001-CVE-2018-11806-QEMU-slirp-heap-buffer-overflow.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1CVE: CVE-2018-11806
2Upstream-Status: Backport
3
4https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg01012.html
5
6From dc21a9d2951f0a2a7e63633e2b5c68c54e4edc4b Mon Sep 17 00:00:00 2001
7From: Jeremy Puhlman <jpuhlman@mvista.com>
8Date: Thu, 14 Jun 2018 01:28:49 +0000
9Subject: [PATCH] CVE-2018-11806 QEMU: slirp: heap buffer overflow
10
11Subject: [Qemu-devel] [PATCH 1/2] slirp: correct size computation while concatenating mbuf
12Date: Tue, 5 Jun 2018 23:38:35 +0530
13From: Prasad J Pandit <address@hidden>
14
15While reassembling incoming fragmented datagrams, 'm_cat' routine
16extends the 'mbuf' buffer, if it has insufficient room. It computes
17a wrong buffer size, which leads to overwriting adjacent heap buffer
18area. Correct this size computation in m_cat.
19
20Reported-by: ZDI Disclosures <address@hidden>
21Signed-off-by: Prasad J Pandit <address@hidden>
22---
23 slirp/mbuf.c | 8 ++++----
24 1 file changed, 4 insertions(+), 4 deletions(-)
25
26Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
27---
28 slirp/mbuf.c | 8 ++++----
29 1 file changed, 4 insertions(+), 4 deletions(-)
30
31diff --git a/slirp/mbuf.c b/slirp/mbuf.c
32index 5ff2455..7fb4501 100644
33--- a/slirp/mbuf.c
34+++ b/slirp/mbuf.c
35@@ -138,7 +138,7 @@ m_cat(struct mbuf *m, struct mbuf *n)
36 * If there's no room, realloc
37 */
38 if (M_FREEROOM(m) < n->m_len)
39- m_inc(m,m->m_size+MINCSIZE);
40+ m_inc(m, m->m_len + n->m_len);
41
42 memcpy(m->m_data+m->m_len, n->m_data, n->m_len);
43 m->m_len += n->m_len;
44@@ -158,12 +158,12 @@ m_inc(struct mbuf *m, int size)
45
46 if (m->m_flags & M_EXT) {
47 datasize = m->m_data - m->m_ext;
48- m->m_ext = g_realloc(m->m_ext, size);
49+ m->m_ext = g_realloc(m->m_ext, size + datasize);
50 m->m_data = m->m_ext + datasize;
51 } else {
52 char *dat;
53 datasize = m->m_data - m->m_dat;
54- dat = g_malloc(size);
55+ dat = g_malloc(size + datasize);
56 memcpy(dat, m->m_dat, m->m_size);
57
58 m->m_ext = dat;
59@@ -171,7 +171,7 @@ m_inc(struct mbuf *m, int size)
60 m->m_flags |= M_EXT;
61 }
62
63- m->m_size = size;
64+ m->m_size = size + datasize;
65
66 }
67
68--
692.13.3
70
diff --git a/meta/recipes-devtools/qemu/qemu_2.12.0.bb b/meta/recipes-devtools/qemu/qemu_3.0.0.bb
index 98db44a8ef..80da0810f1 100644
--- a/meta/recipes-devtools/qemu/qemu_2.12.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_3.0.0.bb
@@ -7,7 +7,7 @@ RDEPENDS_${PN}-ptest = "bash make"
7LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
8 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 8 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
9 9
10SRC_URI = "http://wiki.qemu-project.org/download/${BP}.tar.bz2 \ 10SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
11 file://powerpc_rom.bin \ 11 file://powerpc_rom.bin \
12 file://0001-sdl.c-allow-user-to-disable-pointer-grabs.patch \ 12 file://0001-sdl.c-allow-user-to-disable-pointer-grabs.patch \
13 file://0002-qemu-Add-missing-wacom-HID-descriptor.patch \ 13 file://0002-qemu-Add-missing-wacom-HID-descriptor.patch \
@@ -21,7 +21,6 @@ SRC_URI = "http://wiki.qemu-project.org/download/${BP}.tar.bz2 \
21 file://0009-apic-fixup-fallthrough-to-PIC.patch \ 21 file://0009-apic-fixup-fallthrough-to-PIC.patch \
22 file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ 22 file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \
23 file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \ 23 file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \
24 file://0001-CVE-2018-11806-QEMU-slirp-heap-buffer-overflow.patch \
25 " 24 "
26UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+\..*)\.tar" 25UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+\..*)\.tar"
27 26
@@ -30,8 +29,8 @@ SRC_URI_append_class-native = " \
30 file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ 29 file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \
31 " 30 "
32 31
33SRC_URI[md5sum] = "122fd7cdf241ff7eb1e42c0b503b5d1b" 32SRC_URI[md5sum] = "6a5c8df583406ea24ef25b239c3243e0"
34SRC_URI[sha256sum] = "c9f4a147bc915d24df9784affc611a115f42d24720a89210b479f1ba7a3f679c" 33SRC_URI[sha256sum] = "8d7af64fe8bd5ea5c3bdf17131a8b858491bcce1ee3839425a6d91fb821b5713"
35 34
36COMPATIBLE_HOST_mipsarchn32 = "null" 35COMPATIBLE_HOST_mipsarchn32 = "null"
37COMPATIBLE_HOST_mipsarchn64 = "null" 36COMPATIBLE_HOST_mipsarchn64 = "null"