diff options
author | Mark H Weaver <mhw@netris.org> | 2016-02-02 21:57:43 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-02-03 00:05:22 -0500 |
commit | fd9a5b0fc3594cf3c62099f01502a150a54823fc (patch) | |
tree | bd8566f193f9a8921750a49a203395fa75f946bf /gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch | |
parent | 80cc3a0a4a4e3b7deca4d1e3e4533eb400e3fde9 (diff) | |
download | guix-fd9a5b0fc3594cf3c62099f01502a150a54823fc.tar.gz |
gnu: qemu: Update to 2.5.0; add fixes for security flaws.
* gnu/packages/patches/qemu-CVE-2015-6855.patch: Delete file. * gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch, gnu/packages/patches/qemu-CVE-2015-8558.patch, gnu/packages/patches/qemu-CVE-2015-8567.patch, gnu/packages/patches/qemu-CVE-2015-8613.patch, gnu/packages/patches/qemu-CVE-2015-8701.patch, gnu/packages/patches/qemu-CVE-2015-8743.patch, gnu/packages/patches/qemu-CVE-2016-1568.patch, gnu/packages/patches/qemu-CVE-2016-1922.patch: New files. * gnu-system.am (dist_patch_DATA): Remove 'qemu-CVE-2015-6855.patch'; add the new patches. * gnu/packages/qemu.scm (qemu): Update to 2.5.0. [source]: Remove old patches and add new ones. [arguments]: Add 'disable-test-qga' phase. (%glib-memory-vtable-patch, %glib-duplicate-test-patch): Remove variables.
Diffstat (limited to 'gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch')
-rw-r--r-- | gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch b/gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch new file mode 100644 index 0000000000..497e49f1d9 --- /dev/null +++ b/gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch @@ -0,0 +1,34 @@ +From 4b3a4f2d458ca5a7c6c16ac36a8d9ac22cc253d6 Mon Sep 17 00:00:00 2001 +From: Greg Kurz <gkurz@linux.vnet.ibm.com> +Date: Wed, 23 Dec 2015 10:56:58 +0100 +Subject: [PATCH] virtio-9p: use accessor to get thread_pool + +The aio_context_new() function does not allocate a thread pool. This is +deferred to the first call to the aio_get_thread_pool() accessor. It is +hence forbidden to access the thread_pool field directly, as it may be +NULL. The accessor *must* be used always. + +Fixes: ebac1202c95a4f1b76b6ef3f0f63926fa76e753e +Reviewed-by: Michael Tokarev <mjt@tls.msk.ru> +Tested-by: Michael Tokarev <mjt@tls.msk.ru> +Cc: qemu-stable@nongnu.org +Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> +--- + hw/9pfs/virtio-9p-coth.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/9pfs/virtio-9p-coth.c b/hw/9pfs/virtio-9p-coth.c +index fb6e8f8..ab9425c 100644 +--- a/hw/9pfs/virtio-9p-coth.c ++++ b/hw/9pfs/virtio-9p-coth.c +@@ -36,6 +36,6 @@ static int coroutine_enter_func(void *arg) + void co_run_in_worker_bh(void *opaque) + { + Coroutine *co = opaque; +- thread_pool_submit_aio(qemu_get_aio_context()->thread_pool, ++ thread_pool_submit_aio(aio_get_thread_pool(qemu_get_aio_context()), + coroutine_enter_func, co, coroutine_enter_cb, co); + } +-- +2.6.3 + |