commit: 64e03cf95236f42727ac71051044955f878e8f57 Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Sat Jun 14 05:42:37 2014 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Jun 14 18:05:44 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=64e03cf9
app-emulation/qemu: bump to 2.0.0 --- app-emulation/qemu/files/qemu-1.7.0-cflags.patch | 11 + .../qemu/files/qemu-2.0.0-CVE-2013-4541.patch | 40 ++ .../qemu/files/qemu-2.0.0-CVE-2014-0222.patch | 48 ++ .../qemu/files/qemu-2.0.0-CVE-2014-0223.patch | 57 ++ .../files/qemu-2.0.0-F_SHLCK-and-F_EXLCK.patch | 23 + ...signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch | 37 ++ .../files/qemu-2.0.0-qcow-check-max-sizes.patch | 52 ++ app-emulation/qemu/files/qemu-2.0.0-sigset.patch | 63 +++ .../files/qemu-2.0.0-usb-post-load-checks.patch | 41 ++ .../qemu-9999-virtfs-proxy-helper-accept.patch | 30 ++ app-emulation/qemu/qemu-2.0.0-r99.ebuild | 578 +++++++++++++++++++++ 11 files changed, 980 insertions(+) diff --git a/app-emulation/qemu/files/qemu-1.7.0-cflags.patch b/app-emulation/qemu/files/qemu-1.7.0-cflags.patch new file mode 100644 index 0000000..cd003f6 --- /dev/null +++ b/app-emulation/qemu/files/qemu-1.7.0-cflags.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -3131,8 +3131,6 @@ fi + if test "$gcov" = "yes" ; then + CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" + LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" +-elif test "$debug" = "no" ; then +- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS" + fi + + diff --git a/app-emulation/qemu/files/qemu-2.0.0-CVE-2013-4541.patch b/app-emulation/qemu/files/qemu-2.0.0-CVE-2013-4541.patch new file mode 100644 index 0000000..c4e0d81 --- /dev/null +++ b/app-emulation/qemu/files/qemu-2.0.0-CVE-2013-4541.patch @@ -0,0 +1,40 @@ +From 9f8e9895c504149d7048e9fc5eb5cbb34b16e49a Mon Sep 17 00:00:00 2001 +From: "Michael S. Tsirkin" <[email protected]> +Date: Thu, 3 Apr 2014 19:52:25 +0300 +Subject: [PATCH] usb: sanity check setup_index+setup_len in post_load + +CVE-2013-4541 + +s->setup_len and s->setup_index are fed into usb_packet_copy as +size/offset into s->data_buf, it's possible for invalid state to exploit +this to load arbitrary data. + +setup_len and setup_index should be checked to make sure +they are not negative. + +Cc: Gerd Hoffmann <[email protected]> +Signed-off-by: Michael S. Tsirkin <[email protected]> +Reviewed-by: Gerd Hoffmann <[email protected]> +Signed-off-by: Juan Quintela <[email protected]> +--- + hw/usb/bus.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/hw/usb/bus.c b/hw/usb/bus.c +index fe70429..e48b19f 100644 +--- a/hw/usb/bus.c ++++ b/hw/usb/bus.c +@@ -49,7 +49,9 @@ static int usb_device_post_load(void *opaque, int version_id) + } else { + dev->attached = 1; + } +- if (dev->setup_index >= sizeof(dev->data_buf) || ++ if (dev->setup_index < 0 || ++ dev->setup_len < 0 || ++ dev->setup_index >= sizeof(dev->data_buf) || + dev->setup_len >= sizeof(dev->data_buf)) { + return -EINVAL; + } +-- +1.9.3 + diff --git a/app-emulation/qemu/files/qemu-2.0.0-CVE-2014-0222.patch b/app-emulation/qemu/files/qemu-2.0.0-CVE-2014-0222.patch new file mode 100644 index 0000000..754ad48 --- /dev/null +++ b/app-emulation/qemu/files/qemu-2.0.0-CVE-2014-0222.patch @@ -0,0 +1,48 @@ +From 42eb58179b3b215bb507da3262b682b8a2ec10b5 Mon Sep 17 00:00:00 2001 +From: Kevin Wolf <[email protected]> +Date: Thu, 15 May 2014 16:10:11 +0200 +Subject: [PATCH] qcow1: Validate L2 table size (CVE-2014-0222) + +Too large L2 table sizes cause unbounded allocations. Images actually +created by qemu-img only have 512 byte or 4k L2 tables. + +To keep things consistent with cluster sizes, allow ranges between 512 +bytes and 64k (in fact, down to 1 entry = 8 bytes is technically +working, but L2 table sizes smaller than a cluster don't make a lot of +sense). + +This also means that the number of bytes on the virtual disk that are +described by the same L2 table is limited to at most 8k * 64k or 2^29, +preventively avoiding any integer overflows. + +Cc: [email protected] +Signed-off-by: Kevin Wolf <[email protected]> +Reviewed-by: Benoit Canet <[email protected]> +--- + block/qcow.c | 8 ++++++++ + tests/qemu-iotests/092 | 15 +++++++++++++++ + tests/qemu-iotests/092.out | 11 +++++++++++ + 3 files changed, 34 insertions(+) + +diff --git a/block/qcow.c b/block/qcow.c +index e60df23..e8038e5 100644 +--- a/block/qcow.c ++++ b/block/qcow.c +@@ -139,6 +139,14 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, + goto fail; + } + ++ /* l2_bits specifies number of entries; storing a uint64_t in each entry, ++ * so bytes = num_entries << 3. */ ++ if (header.l2_bits < 9 - 3 || header.l2_bits > 16 - 3) { ++ error_setg(errp, "L2 table size must be between 512 and 64k"); ++ ret = -EINVAL; ++ goto fail; ++ } ++ + if (header.crypt_method > QCOW_CRYPT_AES) { + error_setg(errp, "invalid encryption method in qcow header"); + ret = -EINVAL; +-- +1.9.3 + diff --git a/app-emulation/qemu/files/qemu-2.0.0-CVE-2014-0223.patch b/app-emulation/qemu/files/qemu-2.0.0-CVE-2014-0223.patch new file mode 100644 index 0000000..a5b20a4 --- /dev/null +++ b/app-emulation/qemu/files/qemu-2.0.0-CVE-2014-0223.patch @@ -0,0 +1,57 @@ +From 46485de0cb357b57373e1ca895adedf1f3ed46ec Mon Sep 17 00:00:00 2001 +From: Kevin Wolf <[email protected]> +Date: Thu, 8 May 2014 13:08:20 +0200 +Subject: [PATCH] qcow1: Validate image size (CVE-2014-0223) + +A huge image size could cause s->l1_size to overflow. Make sure that +images never require a L1 table larger than what fits in s->l1_size. + +This cannot only cause unbounded allocations, but also the allocation of +a too small L1 table, resulting in out-of-bounds array accesses (both +reads and writes). + +Cc: [email protected] +Signed-off-by: Kevin Wolf <[email protected]> +--- + block/qcow.c | 16 ++++++++++++++-- + tests/qemu-iotests/092 | 9 +++++++++ + tests/qemu-iotests/092.out | 7 +++++++ + 3 files changed, 30 insertions(+), 2 deletions(-) + +diff --git a/block/qcow.c b/block/qcow.c +index e8038e5..3566c05 100644 +--- a/block/qcow.c ++++ b/block/qcow.c +@@ -61,7 +61,7 @@ typedef struct BDRVQcowState { + int cluster_sectors; + int l2_bits; + int l2_size; +- int l1_size; ++ unsigned int l1_size; + uint64_t cluster_offset_mask; + uint64_t l1_table_offset; + uint64_t *l1_table; +@@ -166,7 +166,19 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, + + /* read the level 1 table */ + shift = s->cluster_bits + s->l2_bits; +- s->l1_size = (header.size + (1LL << shift) - 1) >> shift; ++ if (header.size > UINT64_MAX - (1LL << shift)) { ++ error_setg(errp, "Image too large"); ++ ret = -EINVAL; ++ goto fail; ++ } else { ++ uint64_t l1_size = (header.size + (1LL << shift) - 1) >> shift; ++ if (l1_size > INT_MAX / sizeof(uint64_t)) { ++ error_setg(errp, "Image too large"); ++ ret = -EINVAL; ++ goto fail; ++ } ++ s->l1_size = l1_size; ++ } + + s->l1_table_offset = header.l1_table_offset; + s->l1_table = g_malloc(s->l1_size * sizeof(uint64_t)); +-- +1.9.3 + diff --git a/app-emulation/qemu/files/qemu-2.0.0-F_SHLCK-and-F_EXLCK.patch b/app-emulation/qemu/files/qemu-2.0.0-F_SHLCK-and-F_EXLCK.patch new file mode 100644 index 0000000..fb5ad59 --- /dev/null +++ b/app-emulation/qemu/files/qemu-2.0.0-F_SHLCK-and-F_EXLCK.patch @@ -0,0 +1,23 @@ +Copied from Alpine Linux + +This patch was not upstreamed to qemu as those should probably be +defined in musl libc. + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index c8989b6..00ed747 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -114,6 +114,13 @@ int __clone2(int (*fn)(void *), void *child_stack_base, + + #include "qemu.h" + ++#ifndef F_SHLCK ++#define F_SHLCK 8 ++#endif ++#ifndef F_EXLCK ++#define F_EXLCK 4 ++#endif ++ + #define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \ + CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID) + diff --git a/app-emulation/qemu/files/qemu-2.0.0-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/app-emulation/qemu/files/qemu-2.0.0-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch new file mode 100644 index 0000000..7ea1dba --- /dev/null +++ b/app-emulation/qemu/files/qemu-2.0.0-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch @@ -0,0 +1,37 @@ +From 3e231fa7a2dc66e2ef06ac44f4f719b08fc0c67e Mon Sep 17 00:00:00 2001 +From: Natanael Copa <[email protected]> +Date: Tue, 29 Apr 2014 15:51:31 +0200 +Subject: [PATCH 6/6] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU + platforms + +The __SIGRTMIN and __SIGRTMAX are glibc internals and are not available +on all platforms, so we define those if they are missing. + +This is needed for musl libc. + +Signed-off-by: Natanael Copa <[email protected]> +--- + linux-user/signal.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/linux-user/signal.c b/linux-user/signal.c +index 7d6246f..6019dbb 100644 +--- a/linux-user/signal.c ++++ b/linux-user/signal.c +@@ -32,6 +32,13 @@ + + //#define DEBUG_SIGNAL + ++#ifndef __SIGRTMIN ++#define __SIGRTMIN 32 ++#endif ++#ifndef __SIGRTMAX ++#define __SIGRTMAX (NSIG-1) ++#endif ++ + static struct target_sigaltstack target_sigaltstack_used = { + .ss_sp = 0, + .ss_size = 0, +-- +1.9.2 + diff --git a/app-emulation/qemu/files/qemu-2.0.0-qcow-check-max-sizes.patch b/app-emulation/qemu/files/qemu-2.0.0-qcow-check-max-sizes.patch new file mode 100644 index 0000000..54fdd79 --- /dev/null +++ b/app-emulation/qemu/files/qemu-2.0.0-qcow-check-max-sizes.patch @@ -0,0 +1,52 @@ +From 7159a45b2bf2dcb9f49f1e27d1d3d135a0247a2f Mon Sep 17 00:00:00 2001 +From: Kevin Wolf <[email protected]> +Date: Wed, 7 May 2014 17:30:30 +0200 +Subject: [PATCH] qcow1: Check maximum cluster size + +Huge values for header.cluster_bits cause unbounded allocations (e.g. +for s->cluster_cache) and crash qemu this way. Less huge values may +survive those allocations, but can cause integer overflows later on. + +The only cluster sizes that qemu can create are 4k (for standalone +images) and 512 (for images with backing files), so we can limit it +to 64k. + +Cc: [email protected] +Signed-off-by: Kevin Wolf <[email protected]> +Reviewed-by: Benoit Canet <[email protected]> +--- + block/qcow.c | 10 ++++++-- + tests/qemu-iotests/092 | 63 ++++++++++++++++++++++++++++++++++++++++++++++ + tests/qemu-iotests/092.out | 13 ++++++++++ + tests/qemu-iotests/group | 1 + + 4 files changed, 85 insertions(+), 2 deletions(-) + create mode 100755 tests/qemu-iotests/092 + create mode 100644 tests/qemu-iotests/092.out + +diff --git a/block/qcow.c b/block/qcow.c +index 3684794..e60df23 100644 +--- a/block/qcow.c ++++ b/block/qcow.c +@@ -128,11 +128,17 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, + goto fail; + } + +- if (header.size <= 1 || header.cluster_bits < 9) { +- error_setg(errp, "invalid value in qcow header"); ++ if (header.size <= 1) { ++ error_setg(errp, "Image size is too small (must be at least 2 bytes)"); + ret = -EINVAL; + goto fail; + } ++ if (header.cluster_bits < 9 || header.cluster_bits > 16) { ++ error_setg(errp, "Cluster size must be between 512 and 64k"); ++ ret = -EINVAL; ++ goto fail; ++ } ++ + if (header.crypt_method > QCOW_CRYPT_AES) { + error_setg(errp, "invalid encryption method in qcow header"); + ret = -EINVAL; +-- +1.9.3 + diff --git a/app-emulation/qemu/files/qemu-2.0.0-sigset.patch b/app-emulation/qemu/files/qemu-2.0.0-sigset.patch new file mode 100644 index 0000000..e335b67 --- /dev/null +++ b/app-emulation/qemu/files/qemu-2.0.0-sigset.patch @@ -0,0 +1,63 @@ +commit 34d6086236baeb59f4b46e2380f2b271acd6f6cf +Author: Natanael Copa <[email protected]> +Date: Tue Apr 29 13:11:20 2014 +0200 + + linux-user: avoid using glibc internals in _syscall5 and in definition of target_sigevent struct + + Use the public sigset_t instead of the glibc specific internal + __sigset_t in _syscall. + + Calculate the sigevent pad size is calculated in similar way as kernel + does it instead of using glibc internal field _pad. + + This is needed for building with musl libc. + + Signed-off-by: Natanael Copa <[email protected]> + Signed-off-by: Riku Voipio <[email protected]> + Reviewed-by: Peter Maydell <[email protected]> + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 15de6f8..af0bb35 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -411,7 +411,7 @@ static int sys_inotify_init1(int flags) + #endif + #define __NR_sys_ppoll __NR_ppoll + _syscall5(int, sys_ppoll, struct pollfd *, fds, nfds_t, nfds, +- struct timespec *, timeout, const __sigset_t *, sigmask, ++ struct timespec *, timeout, const sigset_t *, sigmask, + size_t, sigsetsize) + #endif + +diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h +index fdf9a47..69c3982 100644 +--- a/linux-user/syscall_defs.h ++++ b/linux-user/syscall_defs.h +@@ -2552,12 +2552,26 @@ struct target_timer_t { + abi_ulong ptr; + }; + ++#define TARGET_SIGEV_MAX_SIZE 64 ++ ++/* This is architecture-specific but most architectures use the default */ ++#ifdef TARGET_MIPS ++#define TARGET_SIGEV_PREAMBLE_SIZE (sizeof(int32_t) * 2 + sizeof(abi_long)) ++#else ++#define TARGET_SIGEV_PREAMBLE_SIZE (sizeof(int32_t) * 2 \ ++ + sizeof(target_sigval_t)) ++#endif ++ ++#define TARGET_SIGEV_PAD_SIZE ((TARGET_SIGEV_MAX_SIZE \ ++ - TARGET_SIGEV_PREAMBLE_SIZE) \ ++ / sizeof(int32_t)) ++ + struct target_sigevent { + target_sigval_t sigev_value; + int32_t sigev_signo; + int32_t sigev_notify; + union { +- int32_t _pad[ARRAY_SIZE(((struct sigevent *)0)->_sigev_un._pad)]; ++ int32_t _pad[TARGET_SIGEV_PAD_SIZE]; + int32_t _tid; + + struct { diff --git a/app-emulation/qemu/files/qemu-2.0.0-usb-post-load-checks.patch b/app-emulation/qemu/files/qemu-2.0.0-usb-post-load-checks.patch new file mode 100644 index 0000000..4e85c59 --- /dev/null +++ b/app-emulation/qemu/files/qemu-2.0.0-usb-post-load-checks.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/510208 + +From 719ffe1f5f72b1c7ace4afe9ba2815bcb53a829e Mon Sep 17 00:00:00 2001 +From: "Michael S. Tsirkin" <[email protected]> +Date: Tue, 13 May 2014 12:33:16 +0300 +Subject: [PATCH] usb: fix up post load checks + +Correct post load checks: +1. dev->setup_len == sizeof(dev->data_buf) + seems fine, no need to fail migration +2. When state is DATA, passing index > len + will cause memcpy with negative length, + resulting in heap overflow + +First of the issues was reported by dgilbert. + +Reported-by: "Dr. David Alan Gilbert" <[email protected]> +Signed-off-by: Michael S. Tsirkin <[email protected]> +Signed-off-by: Juan Quintela <[email protected]> +--- + hw/usb/bus.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/usb/bus.c b/hw/usb/bus.c +index 699aa10..927a47b 100644 +--- a/hw/usb/bus.c ++++ b/hw/usb/bus.c +@@ -51,8 +51,8 @@ static int usb_device_post_load(void *opaque, int version_id) + } + if (dev->setup_index < 0 || + dev->setup_len < 0 || +- dev->setup_index >= sizeof(dev->data_buf) || +- dev->setup_len >= sizeof(dev->data_buf)) { ++ dev->setup_index > dev->setup_len || ++ dev->setup_len > sizeof(dev->data_buf)) { + return -EINVAL; + } + return 0; +-- +1.9.3 + diff --git a/app-emulation/qemu/files/qemu-9999-virtfs-proxy-helper-accept.patch b/app-emulation/qemu/files/qemu-9999-virtfs-proxy-helper-accept.patch new file mode 100644 index 0000000..f8a5249 --- /dev/null +++ b/app-emulation/qemu/files/qemu-9999-virtfs-proxy-helper-accept.patch @@ -0,0 +1,30 @@ +From c5970614489e385e69667f1f323421442a7a46c0 Mon Sep 17 00:00:00 2001 +From: Tim Comer <[email protected]> +Date: Sat, 19 Apr 2014 12:51:42 -0400 +Subject: [PATCH] virtfs-proxy-helper: fix call to accept + +The current code calls accept() without initializing the size parameter +which means the accept call might write too much to the stack. + +URL: https://bugs.gentoo.org/486714 +Signed-off-by: Tim Comer <[email protected]> +Signed-off-by: Mike Frysinger <[email protected]> +--- + fsdev/virtfs-proxy-helper.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c +index bfecb87..cd291d3 100644 +--- a/fsdev/virtfs-proxy-helper.c ++++ b/fsdev/virtfs-proxy-helper.c +@@ -760,6 +760,7 @@ static int proxy_socket(const char *path, uid_t uid, gid_t gid) + return -1; + } + ++ size = sizeof(qemu); + client = accept(sock, (struct sockaddr *)&qemu, &size); + if (client < 0) { + do_perror("accept"); +-- +1.9.2 + diff --git a/app-emulation/qemu/qemu-2.0.0-r99.ebuild b/app-emulation/qemu/qemu-2.0.0-r99.ebuild new file mode 100644 index 0000000..efbdd23 --- /dev/null +++ b/app-emulation/qemu/qemu-2.0.0-r99.ebuild @@ -0,0 +1,578 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.5 2014/06/06 01:42:41 vapier Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE="ncurses,readline" + +inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ + user udev fcaps readme.gentoo pax-utils + +BACKPORTS= + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="git://git.qemu.org/qemu.git" + inherit git-2 + SRC_URI="" + KEYWORDS="" +else + SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2 + ${BACKPORTS:+ + http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"; + KEYWORDS="amd64 x86" +fi + +DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" +HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"; + +LICENSE="GPL-2 LGPL-2 BSD-2" +SLOT="0" +IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \ +gtk iscsi +jpeg \ +kernel_linux kernel_FreeBSD ncurses opengl +png pulseaudio python \ +rbd sasl +seccomp sdl selinux smartcard spice ssh static static-softmmu \ +static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \ +virtfs +vnc xattr xen xfs" + +COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips +mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32 +x86_64" +IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb" +IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus" + +use_targets=" + $(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) + $(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) +" +IUSE+=" ${use_targets}" + +# Require at least one softmmu or user target. +# Block USE flag configurations known to not work. +REQUIRED_USE="|| ( ${use_targets} ) + python? ( ${PYTHON_REQUIRED_USE} ) + qemu_softmmu_targets_arm? ( fdt ) + qemu_softmmu_targets_microblaze? ( fdt ) + qemu_softmmu_targets_ppc? ( fdt ) + qemu_softmmu_targets_ppc64? ( fdt ) + static? ( static-softmmu static-user ) + static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk ) + virtfs? ( xattr )" + +# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] + sys-libs/zlib[static-libs(+)]" +SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} + >=x11-libs/pixman-0.28.0[static-libs(+)] + aio? ( dev-libs/libaio[static-libs(+)] ) + caps? ( sys-libs/libcap-ng[static-libs(+)] ) + curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) + jpeg? ( virtual/jpeg[static-libs(+)] ) + ncurses? ( sys-libs/ncurses[static-libs(+)] ) + png? ( media-libs/libpng[static-libs(+)] ) + rbd? ( sys-cluster/ceph[static-libs(+)] ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) + sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) + seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) + spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) + ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) + tls? ( net-libs/gnutls[static-libs(+)] ) + usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] ) + uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) + vde? ( net-misc/vde[static-libs(+)] ) + xattr? ( sys-apps/attr[static-libs(+)] ) + xfs? ( sys-fs/xfsprogs[static-libs(+)] )" +USER_LIB_DEPEND="${COMMON_LIB_DEPEND}" +RDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) + !static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) + qemu_softmmu_targets_i386? ( + >=sys-firmware/ipxe-1.0.0_p20130624 + ~sys-firmware/seabios-1.7.4 + ~sys-firmware/sgabios-0.1_pre8 + ~sys-firmware/vgabios-0.7a + ) + qemu_softmmu_targets_x86_64? ( + >=sys-firmware/ipxe-1.0.0_p20130624 + ~sys-firmware/seabios-1.7.4 + ~sys-firmware/sgabios-0.1_pre8 + ~sys-firmware/vgabios-0.7a + ) + accessibility? ( app-accessibility/brltty ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bluetooth? ( net-wireless/bluez ) + gtk? ( + x11-libs/gtk+:3 + x11-libs/vte:2.90 + ) + iscsi? ( net-libs/libiscsi ) + opengl? ( virtual/opengl ) + pulseaudio? ( media-sound/pulseaudio ) + python? ( ${PYTHON_DEPS} ) + sdl? ( media-libs/libsdl[X] ) + selinux? ( sec-policy/selinux-qemu ) + smartcard? ( dev-libs/nss !app-emulation/libcacard ) + spice? ( >=app-emulation/spice-protocol-0.12.3 ) + systemtap? ( dev-util/systemtap ) + usbredir? ( >=sys-apps/usbredir-0.6 ) + virtfs? ( sys-libs/libcap ) + xen? ( app-emulation/xen-tools )" +DEPEND="${RDEPEND} + dev-lang/perl + =dev-lang/python-2* + sys-apps/texinfo + virtual/pkgconfig + kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) + static-softmmu? ( ${SOFTMMU_LIB_DEPEND} ) + static-user? ( ${USER_LIB_DEPEND} ) + test? ( + dev-libs/glib[utils] + sys-devel/bc + )" + +STRIP_MASK="/usr/share/qemu/palcode-clipper" + +QA_PREBUILT=" + usr/share/qemu/openbios-ppc + usr/share/qemu/openbios-sparc64 + usr/share/qemu/openbios-sparc32 + usr/share/qemu/palcode-clipper + usr/share/qemu/s390-ccw.img" + +QA_WX_LOAD="usr/bin/qemu-i386 + usr/bin/qemu-x86_64 + usr/bin/qemu-alpha + usr/bin/qemu-arm + usr/bin/qemu-cris + usr/bin/qemu-m68k + usr/bin/qemu-microblaze + usr/bin/qemu-microblazeel + usr/bin/qemu-mips + usr/bin/qemu-mipsel + usr/bin/qemu-or32 + usr/bin/qemu-ppc + usr/bin/qemu-ppc64 + usr/bin/qemu-ppc64abi32 + usr/bin/qemu-sh4 + usr/bin/qemu-sh4eb + usr/bin/qemu-sparc + usr/bin/qemu-sparc64 + usr/bin/qemu-armeb + usr/bin/qemu-sparc32plus + usr/bin/qemu-s390x + usr/bin/qemu-unicore32" + +DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure +you have the kernel module loaded before running kvm. The easiest way to +ensure that the kernel module is loaded is to load it on boot.\n +For AMD CPUs the module is called 'kvm-amd'\n +For Intel CPUs the module is called 'kvm-intel'\n +Please review /etc/conf.d/modules for how to load these\n\n +Make sure your user is in the 'kvm' group\n +Just run 'gpasswd -a <USER> kvm', then have <USER> re-login." + +qemu_support_kvm() { + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \ + use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \ + use qemu_softmmu_targets_s390x; then + return 0 + fi + + return 1 +} + +pkg_pretend() { + if use kernel_linux && kernel_is lt 2 6 25; then + eerror "This version of KVM requres a host kernel of 2.6.25 or higher." + elif use kernel_linux; then + if ! linux_config_exists; then + eerror "Unable to check your kernel for KVM support" + else + CONFIG_CHECK="~KVM ~TUN ~BRIDGE" + ERROR_KVM="You must enable KVM in your kernel to continue" + ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" + ERROR_KVM_AMD+=" your kernel configuration." + ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" + ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." + ERROR_TUN="You will need the Universal TUN/TAP driver compiled" + ERROR_TUN+=" into your kernel or loaded as a module to use the" + ERROR_TUN+=" virtual network device if using -net tap." + ERROR_BRIDGE="You will also need support for 802.1d" + ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." + use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" + ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" + ERROR_VHOST_NET+=" support" + + if use amd64 || use x86 || use amd64-linux || use x86-linux; then + CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL" + fi + + use python && CONFIG_CHECK+=" ~DEBUG_FS" + ERROR_DEBUG_FS="debugFS support required for kvm_stat" + + # Now do the actual checks setup above + check_extra_config + fi + fi + + if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then + eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" + eerror "instances are still pointing to it. Please update your" + eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" + eerror "and the right system binary (e.g. qemu-system-x86_64)." + die "update your virt configs to not use qemu-kvm" + fi +} + +pkg_setup() { + enewgroup kvm 78 +} + +src_prepare() { + # Alter target makefiles to accept CFLAGS set via flag-o + sed -i -r \ + -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \ + Makefile Makefile.target || die + + epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch + epatch "${FILESDIR}"/qemu-9999-virtfs-proxy-helper-accept.patch #486714 + epatch "${FILESDIR}"/${P}-CVE-2013-4541.patch #510208 + epatch "${FILESDIR}"/${P}-usb-post-load-checks.patch #510208 + epatch "${FILESDIR}"/${P}-qcow-check-max-sizes.patch #510234 + epatch "${FILESDIR}"/${P}-CVE-2014-0222.patch #510234 + epatch "${FILESDIR}"/${P}-CVE-2014-0223.patch #510234 + epatch "${FILESDIR}"/${PN}-1.5.3-openpty.patch #musl + epatch "${FILESDIR}"/${P}-sigset.patch #musl + epatch "${FILESDIR}"/${P}-F_SHLCK-and-F_EXLCK.patch #musl + epatch "${FILESDIR}"/${P}-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch #musl + [[ -n ${BACKPORTS} ]] && \ + EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ + epatch + + # Fix ld and objcopy being called directly + tc-export AR LD OBJCOPY + + # Verbose builds + MAKEOPTS+=" V=1" + + epatch_user +} + +## +# configures qemu based on the build directory and the build type +# we are using. +# +qemu_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + local buildtype=$1 + local builddir=$2 + local static_flag="static-${buildtype}" + + # audio options + local audio_opts="oss" + use alsa && audio_opts="alsa,${audio_opts}" + use sdl && audio_opts="sdl,${audio_opts}" + use pulseaudio && audio_opts="pa,${audio_opts}" + + local conf_opts=( + --prefix=/usr + --sysconfdir=/etc + --libdir=/usr/$(get_libdir) + --docdir=/usr/share/doc/${PF}/html + --disable-bsd-user + --disable-guest-agent + --disable-strip + --disable-werror + --python="${PYTHON}" + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --host-cc="$(tc-getBUILD_CC)" + $(use_enable debug debug-info) + $(use_enable debug debug-tcg) + --enable-docs + $(use_enable tci tcg-interpreter) + ) + + case ${buildtype} in + user) + conf_opts+=( + --enable-linux-user + --disable-system + --target-list="${user_targets}" + --disable-blobs + --disable-bluez + --disable-curses + --disable-kvm + --disable-libiscsi + --disable-glusterfs + --disable-seccomp + --disable-sdl + --disable-smartcard-nss + --disable-tools + --disable-vde + --disable-libssh2 + --disable-libusb + ) + ;; + softmmu) + conf_opts+=( + --disable-linux-user + --enable-system + --with-system-pixman + --target-list="${softmmu_targets}" + $(use_enable bluetooth bluez) + $(use_enable gtk) + $(use_enable sdl) + $(use_enable aio linux-aio) + $(use_enable accessibility brlapi) + $(use_enable caps cap-ng) + $(use_enable curl) + $(use_enable fdt) + $(use_enable glusterfs) + $(use_enable iscsi libiscsi) + $(use_enable jpeg vnc-jpeg) + $(use_enable kernel_linux kvm) + $(use_enable ncurses curses) + $(use_enable opengl glx) + $(use_enable png vnc-png) + $(use_enable rbd) + $(use_enable sasl vnc-sasl) + $(use_enable seccomp) + $(use_enable smartcard smartcard-nss) + $(use_enable spice) + $(use_enable ssh libssh2) + $(use_enable tls vnc-tls) + $(use_enable tls vnc-ws) + $(use_enable usb libusb) + $(use_enable usbredir usb-redir) + $(use_enable uuid) + $(use_enable vde) + $(use_enable vhost-net) + $(use_enable virtfs) + $(use_enable vnc) + $(use_enable xattr attr) + $(use_enable xen) + $(use_enable xen xen-pci-passthrough) + $(use_enable xfs xfsctl) + --audio-drv-list="${audio_opts}" + ) + use gtk && conf_opts+=( --with-gtkabi=3.0 ) + ;; + esac + + # Add support for SystemTAP + use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) + + # We always want to attempt to build with PIE support as it results + # in a more secure binary. But it doesn't work with static or if + # the current GCC doesn't have PIE support. + if use ${static_flag}; then + conf_opts+=( --static --disable-pie ) + else + gcc-specs-pie && conf_opts+=( --enable-pie ) + fi + + einfo "./configure ${conf_opts[*]}" + cd "${builddir}" + ../configure "${conf_opts[@]}" || die "configure failed" + + # FreeBSD's kernel does not support QEMU assigning/grabbing + # host USB devices yet + use kernel_FreeBSD && \ + sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak +} + +src_configure() { + local target + + python_export_best + + softmmu_targets= softmmu_bins=() + user_targets= user_bins=() + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + if use "qemu_softmmu_targets_${target}"; then + softmmu_targets+=",${target}-softmmu" + softmmu_bins+=( "qemu-system-${target}" ) + fi + done + + for target in ${IUSE_USER_TARGETS} ; do + if use "qemu_user_targets_${target}"; then + user_targets+=",${target}-linux-user" + user_bins+=( "qemu-${target}" ) + fi + done + + [[ -n ${softmmu_targets} ]] && \ + einfo "Building the following softmmu targets: ${softmmu_targets}" + + [[ -n ${user_targets} ]] && \ + einfo "Building the following user targets: ${user_targets}" + + if [[ -n ${softmmu_targets} ]]; then + mkdir "${S}/softmmu-build" + qemu_src_configure "softmmu" "${S}/softmmu-build" + fi + + if [[ -n ${user_targets} ]]; then + mkdir "${S}/user-build" + qemu_src_configure "user" "${S}/user-build" + fi +} + +src_compile() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + default + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + default + fi +} + +src_test() { + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + emake -j1 check + emake -j1 check-report.html + fi +} + +qemu_python_install() { + python_domodule "${S}/scripts/qmp/qmp.py" + + python_doscript "${S}/scripts/kvm/kvm_stat" + python_doscript "${S}/scripts/kvm/vmxcap" + python_doscript "${S}/scripts/qmp/qmp-shell" + python_doscript "${S}/scripts/qmp/qemu-ga-client" +} + +src_install() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + emake DESTDIR="${ED}" install + + # Install binfmt handler init script for user targets + newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + emake DESTDIR="${ED}" install + + # This might not exist if the test failed. #512010 + [[ -e check-report.html ]] && dohtml check-report.html + + if use kernel_linux; then + udev_dorules "${FILESDIR}"/65-kvm.rules + fi + + if use python; then + python_foreach_impl qemu_python_install + fi + fi + + # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 + pushd "${ED}"/usr/bin >/dev/null + pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}" + popd >/dev/null + + # Install config file example for qemu-bridge-helper + insinto "/etc/qemu" + doins "${FILESDIR}/bridge.conf" + + # Remove the docdir placed qmp-commands.txt + mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/" + + cd "${S}" + dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt + newdoc pc-bios/README README.pc-bios + dodoc docs/qmp/*.txt + + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${ED}/usr/share/qemu/bios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + fi + + # Remove vgabios since we're using the vgabios packaged one + rm "${ED}/usr/share/qemu/vgabios.bin" + rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" + rm "${ED}/usr/share/qemu/vgabios-qxl.bin" + rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" + rm "${ED}/usr/share/qemu/vgabios-vmware.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin + dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin + dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin + dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin + dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin + fi + + # Remove sgabios since we're using the sgabios packaged one + rm "${ED}/usr/share/qemu/sgabios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin + fi + + # Remove iPXE since we're using the iPXE packaged one + rm "${ED}"/usr/share/qemu/pxe-*.rom + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom + dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom + dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom + dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom + dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom + dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom + fi + + qemu_support_kvm && readme.gentoo_create_doc +} + +pkg_postinst() { + local virtfs_caps= + + if qemu_support_kvm; then + readme.gentoo_print_elog + ewarn "Migration from qemu-kvm instances and loading qemu-kvm created" + ewarn "save states has been removed starting with the 1.6.2 release" + ewarn + ewarn "It is recommended that you migrate any VMs that may be running" + ewarn "on qemu-kvm to a host with a newer qemu and regenerate" + ewarn "any saved states with a newer qemu." + ewarn + ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x" + + if use x86 || use amd64; then + ewarn + ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer" + ewarn "installed. In order to use kvm acceleration, pass the flag" + ewarn "-enable-kvm when running your system target." + fi + fi + + virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid," + virtfs_caps+="cap_setgid,cap_mknod,cap_setuid" + + fcaps cap_net_admin /usr/libexec/qemu-bridge-helper + use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper +} + +pkg_info() { + echo "Using:" + echo " $(best_version app-emulation/spice-protocol)" + echo " $(best_version sys-firmware/ipxe)" + echo " $(best_version sys-firmware/seabios)" + if has_version sys-firmware/seabios[binary]; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/vgabios)" +}
