commit: fd20fa64ab7026533a5e4c554697cc4bcab9e7ef Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Mon Sep 5 16:42:22 2016 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Mon Sep 5 16:45:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd20fa64
app-emulation/qemu: drop vulnerable 2.5.1, bug #592430, and 19 others Package-Manager: portage-2.2.28 .../qemu/files/qemu-2.5.0-CVE-2015-8558.patch | 50 -- .../qemu/files/qemu-2.5.0-CVE-2016-2198.patch | 46 -- .../files/qemu-2.5.0-rng-stack-corrupt-0.patch | 98 --- .../files/qemu-2.5.0-rng-stack-corrupt-1.patch | 135 ---- .../files/qemu-2.5.0-rng-stack-corrupt-2.patch | 155 ----- .../files/qemu-2.5.0-rng-stack-corrupt-3.patch | 179 ------ .../qemu/files/qemu-2.5.1-CVE-2015-8558.patch | 107 ---- .../qemu/files/qemu-2.5.1-CVE-2016-4020.patch | 16 - .../files/qemu-2.5.1-stellaris_enet-overflow.patch | 47 -- .../qemu/files/qemu-2.5.1-xfs-linux-headers.patch | 82 --- app-emulation/qemu/qemu-2.5.1.ebuild | 693 --------------------- 11 files changed, 1608 deletions(-) diff --git a/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8558.patch b/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8558.patch deleted file mode 100644 index fbc6a0a..00000000 --- a/app-emulation/qemu/files/qemu-2.5.0-CVE-2015-8558.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://bugs.gentoo.org/568246 - -From 156a2e4dbffa85997636a7a39ef12da6f1b40254 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann <[email protected]> -Date: Mon, 14 Dec 2015 09:21:23 +0100 -Subject: [PATCH] ehci: make idt processing more robust - -Make ehci_process_itd return an error in case we didn't do any actual -iso transfer because we've found no active transaction. That'll avoid -ehci happily run in circles forever if the guest builds a loop out of -idts. - -This is CVE-2015-8558. - -Cc: [email protected] -Reported-by: Qinghao Tang <[email protected]> -Tested-by: P J P <[email protected]> -Signed-off-by: Gerd Hoffmann <[email protected]> ---- - hw/usb/hcd-ehci.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c -index 4e2161b..d07f228 100644 ---- a/hw/usb/hcd-ehci.c -+++ b/hw/usb/hcd-ehci.c -@@ -1389,7 +1389,7 @@ static int ehci_process_itd(EHCIState *ehci, - { - USBDevice *dev; - USBEndpoint *ep; -- uint32_t i, len, pid, dir, devaddr, endp; -+ uint32_t i, len, pid, dir, devaddr, endp, xfers = 0; - uint32_t pg, off, ptr1, ptr2, max, mult; - - ehci->periodic_sched_active = PERIODIC_ACTIVE; -@@ -1479,9 +1479,10 @@ static int ehci_process_itd(EHCIState *ehci, - ehci_raise_irq(ehci, USBSTS_INT); - } - itd->transact[i] &= ~ITD_XACT_ACTIVE; -+ xfers++; - } - } -- return 0; -+ return xfers ? 0 : -1; - } - - --- -2.6.2 - diff --git a/app-emulation/qemu/files/qemu-2.5.0-CVE-2016-2198.patch b/app-emulation/qemu/files/qemu-2.5.0-CVE-2016-2198.patch deleted file mode 100644 index d179c33..00000000 --- a/app-emulation/qemu/files/qemu-2.5.0-CVE-2016-2198.patch +++ /dev/null @@ -1,46 +0,0 @@ -From dff0367cf66f489aa772320fa2937a8cac1ca30d Mon Sep 17 00:00:00 2001 -From: Prasad J Pandit <[email protected]> -Date: Fri, 29 Jan 2016 18:30:34 +0530 -Subject: [PATCH] usb: ehci: add capability mmio write function - -USB Ehci emulation supports host controller capability registers. -But its mmio '.write' function was missing, which lead to a null -pointer dereference issue. Add a do nothing 'ehci_caps_write' -definition to avoid it; Do nothing because capability registers -are Read Only(RO). - -Reported-by: Zuozhi Fzz <[email protected]> -Signed-off-by: Prasad J Pandit <[email protected]> -Message-id: [email protected] -Signed-off-by: Gerd Hoffmann <[email protected]> ---- - hw/usb/hcd-ehci.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c -index 1b50601..0f95d0d 100644 ---- a/hw/usb/hcd-ehci.c -+++ b/hw/usb/hcd-ehci.c -@@ -895,6 +895,11 @@ static uint64_t ehci_caps_read(void *ptr, hwaddr addr, - return s->caps[addr]; - } - -+static void ehci_caps_write(void *ptr, hwaddr addr, -+ uint64_t val, unsigned size) -+{ -+} -+ - static uint64_t ehci_opreg_read(void *ptr, hwaddr addr, - unsigned size) - { -@@ -2315,6 +2320,7 @@ static void ehci_frame_timer(void *opaque) - - static const MemoryRegionOps ehci_mmio_caps_ops = { - .read = ehci_caps_read, -+ .write = ehci_caps_write, - .valid.min_access_size = 1, - .valid.max_access_size = 4, - .impl.min_access_size = 1, --- -2.7.4 - diff --git a/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-0.patch b/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-0.patch deleted file mode 100644 index 684f6ad..00000000 --- a/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-0.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 3c52ddcdc548e7fbe65112d8a7bdc9cd105b4750 Mon Sep 17 00:00:00 2001 -From: Ladi Prosek <[email protected]> -Date: Thu, 3 Mar 2016 09:37:15 +0100 -Subject: [PATCH] rng: remove the unused request cancellation code - -rng_backend_cancel_requests had no callers and none of the code -deleted in this commit ever ran. - -Signed-off-by: Ladi Prosek <[email protected]> -Reviewed-by: Amit Shah <[email protected]> -Message-Id: <[email protected]> -Signed-off-by: Amit Shah <[email protected]> ---- - backends/rng-egd.c | 12 ------------ - backends/rng.c | 9 --------- - include/sysemu/rng.h | 11 ----------- - 3 files changed, 32 deletions(-) - -diff --git a/backends/rng-egd.c b/backends/rng-egd.c -index 2de5cd5..0b2976a 100644 ---- a/backends/rng-egd.c -+++ b/backends/rng-egd.c -@@ -125,17 +125,6 @@ static void rng_egd_free_requests(RngEgd *s) - s->requests = NULL; - } - --static void rng_egd_cancel_requests(RngBackend *b) --{ -- RngEgd *s = RNG_EGD(b); -- -- /* We simply delete the list of pending requests. If there is data in the -- * queue waiting to be read, this is okay, because there will always be -- * more data than we requested originally -- */ -- rng_egd_free_requests(s); --} -- - static void rng_egd_opened(RngBackend *b, Error **errp) - { - RngEgd *s = RNG_EGD(b); -@@ -213,7 +202,6 @@ static void rng_egd_class_init(ObjectClass *klass, void *data) - RngBackendClass *rbc = RNG_BACKEND_CLASS(klass); - - rbc->request_entropy = rng_egd_request_entropy; -- rbc->cancel_requests = rng_egd_cancel_requests; - rbc->opened = rng_egd_opened; - } - -diff --git a/backends/rng.c b/backends/rng.c -index b7820ef..2f2f3ee 100644 ---- a/backends/rng.c -+++ b/backends/rng.c -@@ -26,15 +26,6 @@ void rng_backend_request_entropy(RngBackend *s, size_t size, - } - } - --void rng_backend_cancel_requests(RngBackend *s) --{ -- RngBackendClass *k = RNG_BACKEND_GET_CLASS(s); -- -- if (k->cancel_requests) { -- k->cancel_requests(s); -- } --} -- - static bool rng_backend_prop_get_opened(Object *obj, Error **errp) - { - RngBackend *s = RNG_BACKEND(obj); -diff --git a/include/sysemu/rng.h b/include/sysemu/rng.h -index 858be8c..87b3ebe 100644 ---- a/include/sysemu/rng.h -+++ b/include/sysemu/rng.h -@@ -37,7 +37,6 @@ struct RngBackendClass - - void (*request_entropy)(RngBackend *s, size_t size, - EntropyReceiveFunc *receive_entropy, void *opaque); -- void (*cancel_requests)(RngBackend *s); - - void (*opened)(RngBackend *s, Error **errp); - }; -@@ -68,14 +67,4 @@ struct RngBackend - void rng_backend_request_entropy(RngBackend *s, size_t size, - EntropyReceiveFunc *receive_entropy, - void *opaque); -- --/** -- * rng_backend_cancel_requests: -- * @s: the backend to cancel all pending requests in -- * -- * Cancels all pending requests submitted by @rng_backend_request_entropy. This -- * should be used by a device during reset or in preparation for live migration -- * to stop tracking any request. -- */ --void rng_backend_cancel_requests(RngBackend *s); - #endif --- -2.7.4 - diff --git a/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-1.patch b/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-1.patch deleted file mode 100644 index 44ba8a7..00000000 --- a/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-1.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 74074e8a7c60592cf1cc6469dbc2550d24aeded3 Mon Sep 17 00:00:00 2001 -From: Ladi Prosek <[email protected]> -Date: Thu, 3 Mar 2016 09:37:16 +0100 -Subject: [PATCH] rng: move request queue from RngEgd to RngBackend - -The 'requests' field now lives in the RngBackend parent class. -There are no functional changes in this commit. - -Signed-off-by: Ladi Prosek <[email protected]> -Reviewed-by: Amit Shah <[email protected]> -Message-Id: <[email protected]> -Signed-off-by: Amit Shah <[email protected]> ---- - backends/rng-egd.c | 28 +++++++++------------------- - include/sysemu/rng.h | 11 +++++++++++ - 2 files changed, 20 insertions(+), 19 deletions(-) - -diff --git a/backends/rng-egd.c b/backends/rng-egd.c -index 0b2976a..b061362 100644 ---- a/backends/rng-egd.c -+++ b/backends/rng-egd.c -@@ -25,19 +25,8 @@ typedef struct RngEgd - - CharDriverState *chr; - char *chr_name; -- -- GSList *requests; - } RngEgd; - --typedef struct RngRequest --{ -- EntropyReceiveFunc *receive_entropy; -- uint8_t *data; -- void *opaque; -- size_t offset; -- size_t size; --} RngRequest; -- - static void rng_egd_request_entropy(RngBackend *b, size_t size, - EntropyReceiveFunc *receive_entropy, - void *opaque) -@@ -66,7 +55,7 @@ static void rng_egd_request_entropy(RngBackend *b, size_t size, - size -= len; - } - -- s->requests = g_slist_append(s->requests, req); -+ s->parent.requests = g_slist_append(s->parent.requests, req); - } - - static void rng_egd_free_request(RngRequest *req) -@@ -81,7 +70,7 @@ static int rng_egd_chr_can_read(void *opaque) - GSList *i; - int size = 0; - -- for (i = s->requests; i; i = i->next) { -+ for (i = s->parent.requests; i; i = i->next) { - RngRequest *req = i->data; - size += req->size - req->offset; - } -@@ -94,8 +83,8 @@ static void rng_egd_chr_read(void *opaque, const uint8_t *buf, int size) - RngEgd *s = RNG_EGD(opaque); - size_t buf_offset = 0; - -- while (size > 0 && s->requests) { -- RngRequest *req = s->requests->data; -+ while (size > 0 && s->parent.requests) { -+ RngRequest *req = s->parent.requests->data; - int len = MIN(size, req->size - req->offset); - - memcpy(req->data + req->offset, buf + buf_offset, len); -@@ -104,7 +93,8 @@ static void rng_egd_chr_read(void *opaque, const uint8_t *buf, int size) - size -= len; - - if (req->offset == req->size) { -- s->requests = g_slist_remove_link(s->requests, s->requests); -+ s->parent.requests = g_slist_remove_link(s->parent.requests, -+ s->parent.requests); - - req->receive_entropy(req->opaque, req->data, req->size); - -@@ -117,12 +107,12 @@ static void rng_egd_free_requests(RngEgd *s) - { - GSList *i; - -- for (i = s->requests; i; i = i->next) { -+ for (i = s->parent.requests; i; i = i->next) { - rng_egd_free_request(i->data); - } - -- g_slist_free(s->requests); -- s->requests = NULL; -+ g_slist_free(s->parent.requests); -+ s->parent.requests = NULL; - } - - static void rng_egd_opened(RngBackend *b, Error **errp) -diff --git a/include/sysemu/rng.h b/include/sysemu/rng.h -index 87b3ebe..c744d82 100644 ---- a/include/sysemu/rng.h -+++ b/include/sysemu/rng.h -@@ -24,6 +24,7 @@ - #define RNG_BACKEND_CLASS(klass) \ - OBJECT_CLASS_CHECK(RngBackendClass, (klass), TYPE_RNG_BACKEND) - -+typedef struct RngRequest RngRequest; - typedef struct RngBackendClass RngBackendClass; - typedef struct RngBackend RngBackend; - -@@ -31,6 +32,15 @@ typedef void (EntropyReceiveFunc)(void *opaque, - const void *data, - size_t size); - -+struct RngRequest -+{ -+ EntropyReceiveFunc *receive_entropy; -+ uint8_t *data; -+ void *opaque; -+ size_t offset; -+ size_t size; -+}; -+ - struct RngBackendClass - { - ObjectClass parent_class; -@@ -47,6 +57,7 @@ struct RngBackend - - /*< protected >*/ - bool opened; -+ GSList *requests; - }; - - /** --- -2.7.4 - diff --git a/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-2.patch b/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-2.patch deleted file mode 100644 index 1cffcc5..00000000 --- a/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-2.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 9f14b0add1dcdbfa2ee61051d068211fb0a1fcc9 Mon Sep 17 00:00:00 2001 -From: Ladi Prosek <[email protected]> -Date: Thu, 3 Mar 2016 09:37:17 +0100 -Subject: [PATCH] rng: move request queue cleanup from RngEgd to RngBackend - -RngBackend is now in charge of cleaning up the linked list on -instance finalization. It also exposes a function to finalize -individual RngRequest instances, called by its child classes. - -Signed-off-by: Ladi Prosek <[email protected]> -Reviewed-by: Amit Shah <[email protected]> -Message-Id: <[email protected]> -Signed-off-by: Amit Shah <[email protected]> ---- - backends/rng-egd.c | 25 +------------------------ - backends/rng.c | 32 ++++++++++++++++++++++++++++++++ - include/sysemu/rng.h | 12 ++++++++++++ - 3 files changed, 45 insertions(+), 24 deletions(-) - -diff --git a/backends/rng-egd.c b/backends/rng-egd.c -index b061362..8f2bd16 100644 ---- a/backends/rng-egd.c -+++ b/backends/rng-egd.c -@@ -58,12 +58,6 @@ static void rng_egd_request_entropy(RngBackend *b, size_t size, - s->parent.requests = g_slist_append(s->parent.requests, req); - } - --static void rng_egd_free_request(RngRequest *req) --{ -- g_free(req->data); -- g_free(req); --} -- - static int rng_egd_chr_can_read(void *opaque) - { - RngEgd *s = RNG_EGD(opaque); -@@ -93,28 +87,13 @@ static void rng_egd_chr_read(void *opaque, const uint8_t *buf, int size) - size -= len; - - if (req->offset == req->size) { -- s->parent.requests = g_slist_remove_link(s->parent.requests, -- s->parent.requests); -- - req->receive_entropy(req->opaque, req->data, req->size); - -- rng_egd_free_request(req); -+ rng_backend_finalize_request(&s->parent, req); - } - } - } - --static void rng_egd_free_requests(RngEgd *s) --{ -- GSList *i; -- -- for (i = s->parent.requests; i; i = i->next) { -- rng_egd_free_request(i->data); -- } -- -- g_slist_free(s->parent.requests); -- s->parent.requests = NULL; --} -- - static void rng_egd_opened(RngBackend *b, Error **errp) - { - RngEgd *s = RNG_EGD(b); -@@ -183,8 +162,6 @@ static void rng_egd_finalize(Object *obj) - } - - g_free(s->chr_name); -- -- rng_egd_free_requests(s); - } - - static void rng_egd_class_init(ObjectClass *klass, void *data) -diff --git a/backends/rng.c b/backends/rng.c -index 2f2f3ee..014cb9d 100644 ---- a/backends/rng.c -+++ b/backends/rng.c -@@ -64,6 +64,30 @@ static void rng_backend_prop_set_opened(Object *obj, bool value, Error **errp) - s->opened = true; - } - -+static void rng_backend_free_request(RngRequest *req) -+{ -+ g_free(req->data); -+ g_free(req); -+} -+ -+static void rng_backend_free_requests(RngBackend *s) -+{ -+ GSList *i; -+ -+ for (i = s->requests; i; i = i->next) { -+ rng_backend_free_request(i->data); -+ } -+ -+ g_slist_free(s->requests); -+ s->requests = NULL; -+} -+ -+void rng_backend_finalize_request(RngBackend *s, RngRequest *req) -+{ -+ s->requests = g_slist_remove(s->requests, req); -+ rng_backend_free_request(req); -+} -+ - static void rng_backend_init(Object *obj) - { - object_property_add_bool(obj, "opened", -@@ -72,6 +96,13 @@ static void rng_backend_init(Object *obj) - NULL); - } - -+static void rng_backend_finalize(Object *obj) -+{ -+ RngBackend *s = RNG_BACKEND(obj); -+ -+ rng_backend_free_requests(s); -+} -+ - static void rng_backend_class_init(ObjectClass *oc, void *data) - { - UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); -@@ -84,6 +115,7 @@ static const TypeInfo rng_backend_info = { - .parent = TYPE_OBJECT, - .instance_size = sizeof(RngBackend), - .instance_init = rng_backend_init, -+ .instance_finalize = rng_backend_finalize, - .class_size = sizeof(RngBackendClass), - .class_init = rng_backend_class_init, - .abstract = true, -diff --git a/include/sysemu/rng.h b/include/sysemu/rng.h -index c744d82..08a2eda 100644 ---- a/include/sysemu/rng.h -+++ b/include/sysemu/rng.h -@@ -78,4 +79,15 @@ struct RngBackend - void rng_backend_request_entropy(RngBackend *s, size_t size, - EntropyReceiveFunc *receive_entropy, - void *opaque); -+ -+/** -+ * rng_backend_free_request: -+ * @s: the backend that created the request -+ * @req: the request to finalize -+ * -+ * Used by child rng backend classes to finalize requests once they've been -+ * processed. The request is removed from the list of active requests and -+ * deleted. -+ */ -+void rng_backend_finalize_request(RngBackend *s, RngRequest *req); - #endif --- -2.7.4 - diff --git a/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-3.patch b/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-3.patch deleted file mode 100644 index ca9340a..00000000 --- a/app-emulation/qemu/files/qemu-2.5.0-rng-stack-corrupt-3.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 60253ed1e6ec6d8e5ef2efe7bf755f475dce9956 Mon Sep 17 00:00:00 2001 -From: Ladi Prosek <[email protected]> -Date: Thu, 3 Mar 2016 09:37:18 +0100 -Subject: [PATCH] rng: add request queue support to rng-random - -Requests are now created in the RngBackend parent class and the -code path is shared by both rng-egd and rng-random. - -This commit fixes the rng-random implementation which processed -only one request at a time and simply discarded all but the most -recent one. In the guest this manifested as delayed completion -of reads from virtio-rng, i.e. a read was completed only after -another read was issued. - -By switching rng-random to use the same request queue as rng-egd, -the unsafe stack-based allocation of the entropy buffer is -eliminated and replaced with g_malloc. - -Signed-off-by: Ladi Prosek <[email protected]> -Reviewed-by: Amit Shah <[email protected]> -Message-Id: <[email protected]> -Signed-off-by: Amit Shah <[email protected]> ---- - backends/rng-egd.c | 16 ++-------------- - backends/rng-random.c | 43 +++++++++++++++++++------------------------ - backends/rng.c | 13 ++++++++++++- - include/sysemu/rng.h | 3 +-- - 4 files changed, 34 insertions(+), 41 deletions(-) - -diff --git a/backends/rng-egd.c b/backends/rng-egd.c -index 8f2bd16..30332ed 100644 ---- a/backends/rng-egd.c -+++ b/backends/rng-egd.c -@@ -27,20 +27,10 @@ typedef struct RngEgd - char *chr_name; - } RngEgd; - --static void rng_egd_request_entropy(RngBackend *b, size_t size, -- EntropyReceiveFunc *receive_entropy, -- void *opaque) -+static void rng_egd_request_entropy(RngBackend *b, RngRequest *req) - { - RngEgd *s = RNG_EGD(b); -- RngRequest *req; -- -- req = g_malloc(sizeof(*req)); -- -- req->offset = 0; -- req->size = size; -- req->receive_entropy = receive_entropy; -- req->opaque = opaque; -- req->data = g_malloc(req->size); -+ size_t size = req->size; - - while (size > 0) { - uint8_t header[2]; -@@ -54,8 +44,6 @@ static void rng_egd_request_entropy(RngBackend *b, size_t size, - - size -= len; - } -- -- s->parent.requests = g_slist_append(s->parent.requests, req); - } - - static int rng_egd_chr_can_read(void *opaque) -diff --git a/backends/rng-random.c b/backends/rng-random.c -index 8cdad6a..a6cb385 100644 ---- a/backends/rng-random.c -+++ b/backends/rng-random.c -@@ -22,10 +22,6 @@ struct RndRandom - - int fd; - char *filename; -- -- EntropyReceiveFunc *receive_func; -- void *opaque; -- size_t size; - }; - - /** -@@ -38,36 +34,35 @@ struct RndRandom - static void entropy_available(void *opaque) - { - RndRandom *s = RNG_RANDOM(opaque); -- uint8_t buffer[s->size]; -- ssize_t len; - -- len = read(s->fd, buffer, s->size); -- if (len < 0 && errno == EAGAIN) { -- return; -- } -- g_assert(len != -1); -+ while (s->parent.requests != NULL) { -+ RngRequest *req = s->parent.requests->data; -+ ssize_t len; -+ -+ len = read(s->fd, req->data, req->size); -+ if (len < 0 && errno == EAGAIN) { -+ return; -+ } -+ g_assert(len != -1); - -- s->receive_func(s->opaque, buffer, len); -- s->receive_func = NULL; -+ req->receive_entropy(req->opaque, req->data, len); - -+ rng_backend_finalize_request(&s->parent, req); -+ } -+ -+ /* We've drained all requests, the fd handler can be reset. */ - qemu_set_fd_handler(s->fd, NULL, NULL, NULL); - } - --static void rng_random_request_entropy(RngBackend *b, size_t size, -- EntropyReceiveFunc *receive_entropy, -- void *opaque) -+static void rng_random_request_entropy(RngBackend *b, RngRequest *req) - { - RndRandom *s = RNG_RANDOM(b); - -- if (s->receive_func) { -- s->receive_func(s->opaque, NULL, 0); -+ if (s->parent.requests == NULL) { -+ /* If there are no pending requests yet, we need to -+ * install our fd handler. */ -+ qemu_set_fd_handler(s->fd, entropy_available, NULL, s); - } -- -- s->receive_func = receive_entropy; -- s->opaque = opaque; -- s->size = size; -- -- qemu_set_fd_handler(s->fd, entropy_available, NULL, s); - } - - static void rng_random_opened(RngBackend *b, Error **errp) -diff --git a/backends/rng.c b/backends/rng.c -index 014cb9d..277a41b 100644 ---- a/backends/rng.c -+++ b/backends/rng.c -@@ -20,9 +20,20 @@ void rng_backend_request_entropy(RngBackend *s, size_t size, - void *opaque) - { - RngBackendClass *k = RNG_BACKEND_GET_CLASS(s); -+ RngRequest *req; - - if (k->request_entropy) { -- k->request_entropy(s, size, receive_entropy, opaque); -+ req = g_malloc(sizeof(*req)); -+ -+ req->offset = 0; -+ req->size = size; -+ req->receive_entropy = receive_entropy; -+ req->opaque = opaque; -+ req->data = g_malloc(req->size); -+ -+ k->request_entropy(s, req); -+ -+ s->requests = g_slist_append(s->requests, req); - } - } - -diff --git a/include/sysemu/rng.h b/include/sysemu/rng.h -index 08a2eda..4fffd68 100644 ---- a/include/sysemu/rng.h -+++ b/include/sysemu/rng.h -@@ -45,8 +45,7 @@ struct RngBackendClass - { - ObjectClass parent_class; - -- void (*request_entropy)(RngBackend *s, size_t size, -- EntropyReceiveFunc *receive_entropy, void *opaque); -+ void (*request_entropy)(RngBackend *s, RngRequest *req); - - void (*opened)(RngBackend *s, Error **errp); - }; --- -2.7.4 - diff --git a/app-emulation/qemu/files/qemu-2.5.1-CVE-2015-8558.patch b/app-emulation/qemu/files/qemu-2.5.1-CVE-2015-8558.patch deleted file mode 100644 index cf1a4c3..00000000 --- a/app-emulation/qemu/files/qemu-2.5.1-CVE-2015-8558.patch +++ /dev/null @@ -1,107 +0,0 @@ -https://bugs.gentoo.org/580426 -https://bugs.gentoo.org/568246 - -From a49923d2837d20510d645d3758f1ad87c32d0730 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann <[email protected]> -Date: Mon, 18 Apr 2016 09:20:54 +0200 -Subject: [PATCH] Revert "ehci: make idt processing more robust" - -This reverts commit 156a2e4dbffa85997636a7a39ef12da6f1b40254. - -Breaks FreeBSD. - -Signed-off-by: Gerd Hoffmann <[email protected]> ---- - hw/usb/hcd-ehci.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c -index d5c0e1c..43a8f7a 100644 ---- a/hw/usb/hcd-ehci.c -+++ b/hw/usb/hcd-ehci.c -@@ -1397,7 +1397,7 @@ static int ehci_process_itd(EHCIState *ehci, - { - USBDevice *dev; - USBEndpoint *ep; -- uint32_t i, len, pid, dir, devaddr, endp, xfers = 0; -+ uint32_t i, len, pid, dir, devaddr, endp; - uint32_t pg, off, ptr1, ptr2, max, mult; - - ehci->periodic_sched_active = PERIODIC_ACTIVE; -@@ -1489,10 +1489,9 @@ static int ehci_process_itd(EHCIState *ehci, - ehci_raise_irq(ehci, USBSTS_INT); - } - itd->transact[i] &= ~ITD_XACT_ACTIVE; -- xfers++; - } - } -- return xfers ? 0 : -1; -+ return 0; - } - - --- -2.7.4 - -From 1ae3f2f178087711f9591350abad133525ba93f2 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann <[email protected]> -Date: Mon, 18 Apr 2016 09:11:38 +0200 -Subject: [PATCH] ehci: apply limit to iTD/sidt descriptors -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit "156a2e4 ehci: make idt processing more robust" tries to avoid a -DoS by the guest (create a circular iTD queue and let qemu ehci -emulation run in circles forever). Unfortunately this has two problems: -First it misses the case of siTDs, and second it reportedly breaks -FreeBSD. - -So lets go for a different approach: just count the number of iTDs and -siTDs we have seen per frame and apply a limit. That should really -catch all cases now. - -Reported-by: 杜少博 <[email protected]> -Signed-off-by: Gerd Hoffmann <[email protected]> ---- - hw/usb/hcd-ehci.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c -index 159f58d..d5c0e1c 100644 ---- a/hw/usb/hcd-ehci.c -+++ b/hw/usb/hcd-ehci.c -@@ -2011,6 +2011,7 @@ static int ehci_state_writeback(EHCIQueue *q) - static void ehci_advance_state(EHCIState *ehci, int async) - { - EHCIQueue *q = NULL; -+ int itd_count = 0; - int again; - - do { -@@ -2035,10 +2036,12 @@ static void ehci_advance_state(EHCIState *ehci, int async) - - case EST_FETCHITD: - again = ehci_state_fetchitd(ehci, async); -+ itd_count++; - break; - - case EST_FETCHSITD: - again = ehci_state_fetchsitd(ehci, async); -+ itd_count++; - break; - - case EST_ADVANCEQUEUE: -@@ -2087,7 +2090,8 @@ static void ehci_advance_state(EHCIState *ehci, int async) - break; - } - -- if (again < 0) { -+ if (again < 0 || itd_count > 16) { -+ /* TODO: notify guest (raise HSE irq?) */ - fprintf(stderr, "processing error - resetting ehci HC\n"); - ehci_reset(ehci); - again = 0; --- -2.7.4 - diff --git a/app-emulation/qemu/files/qemu-2.5.1-CVE-2016-4020.patch b/app-emulation/qemu/files/qemu-2.5.1-CVE-2016-4020.patch deleted file mode 100644 index e3115c1..00000000 --- a/app-emulation/qemu/files/qemu-2.5.1-CVE-2016-4020.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://lists.gnu.org/archive/html/qemu-devel/2016-04/msg01106.html -https://bugs.gentoo.org/580040 - -diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c -index c69f374..ff1e31a 100644 ---- a/hw/i386/kvmvapic.c -+++ b/hw/i386/kvmvapic.c -@@ -394,7 +394,7 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) - CPUX86State *env = &cpu->env; - VAPICHandlers *handlers; - uint8_t opcode[2]; -- uint32_t imm32; -+ uint32_t imm32 = 0; - target_ulong current_pc = 0; - target_ulong current_cs_base = 0; - int current_flags = 0; diff --git a/app-emulation/qemu/files/qemu-2.5.1-stellaris_enet-overflow.patch b/app-emulation/qemu/files/qemu-2.5.1-stellaris_enet-overflow.patch deleted file mode 100644 index ab7d3f3..00000000 --- a/app-emulation/qemu/files/qemu-2.5.1-stellaris_enet-overflow.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3a15cc0e1ee7168db0782133d2607a6bfa422d66 Mon Sep 17 00:00:00 2001 -From: Prasad J Pandit <[email protected]> -Date: Fri, 8 Apr 2016 11:33:48 +0530 -Subject: [PATCH] net: stellaris_enet: check packet length against receive - buffer - -When receiving packets over Stellaris ethernet controller, it -uses receive buffer of size 2048 bytes. In case the controller -accepts large(MTU) packets, it could lead to memory corruption. -Add check to avoid it. - -Reported-by: Oleksandr Bazhaniuk <[email protected]> -Signed-off-by: Prasad J Pandit <[email protected]> -Message-id: [email protected] -Reviewed-by: Peter Maydell <[email protected]> -Signed-off-by: Peter Maydell <[email protected]> ---- - hw/net/stellaris_enet.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c -index 84cf60b..6880894 100644 ---- a/hw/net/stellaris_enet.c -+++ b/hw/net/stellaris_enet.c -@@ -236,8 +236,18 @@ static ssize_t stellaris_enet_receive(NetClientState *nc, const uint8_t *buf, si - n = s->next_packet + s->np; - if (n >= 31) - n -= 31; -- s->np++; - -+ if (size >= sizeof(s->rx[n].data) - 6) { -+ /* If the packet won't fit into the -+ * emulated 2K RAM, this is reported -+ * as a FIFO overrun error. -+ */ -+ s->ris |= SE_INT_FOV; -+ stellaris_enet_update(s); -+ return -1; -+ } -+ -+ s->np++; - s->rx[n].len = size + 6; - p = s->rx[n].data; - *(p++) = (size + 6); --- -2.7.4 - diff --git a/app-emulation/qemu/files/qemu-2.5.1-xfs-linux-headers.patch b/app-emulation/qemu/files/qemu-2.5.1-xfs-linux-headers.patch deleted file mode 100644 index 743171b..00000000 --- a/app-emulation/qemu/files/qemu-2.5.1-xfs-linux-headers.patch +++ /dev/null @@ -1,82 +0,0 @@ -https://bugs.gentoo.org/577810 - -From 277abf15a60f7653bfb05ffb513ed74ffdaea1b7 Mon Sep 17 00:00:00 2001 -From: Jan Vesely <[email protected]> -Date: Fri, 29 Apr 2016 13:15:23 -0400 -Subject: [PATCH] configure: Check if struct fsxattr is available from linux - header -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build failure with --enable-xfsctl and -new linux headers (>=4.5) and older xfsprogs(<4.5): -In file included from /usr/include/xfs/xfs.h:38:0, - from /var/tmp/portage/app-emulation/qemu-2.5.0-r1/work/qemu-2.5.0/block/raw-posix.c:97: -/usr/include/xfs/xfs_fs.h:42:8: error: redefinition of ‘struct fsxattr’ - struct fsxattr { - ^ -In file included from /var/tmp/portage/app-emulation/qemu-2.5.0-r1/work/qemu-2.5.0/block/raw-posix.c:60:0: -/usr/include/linux/fs.h:155:8: note: originally defined here - struct fsxattr { - -This is really a bug in the system headers, but we can work around it -by defining HAVE_FSXATTR in the QEMU headers if linux/fs.h provides -the struct, so that xfs_fs.h doesn't try to define it as well. - -CC: [email protected] -CC: Markus Armbruster <[email protected]> -CC: Peter Maydell <[email protected]> -CC: Stefan Weil <[email protected]> -Tested-by: Stefan Weil <[email protected]> -Signed-off-by: Jan Vesely <[email protected]> -[PMM: adjusted commit message, comments] -Signed-off-by: Peter Maydell <[email protected]> ---- - configure | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/configure b/configure -index ab54f3c..c37fc5f 100755 ---- a/configure -+++ b/configure -@@ -4494,6 +4494,21 @@ if test "$fortify_source" != "no"; then - fi - - ########################################## -+# check if struct fsxattr is available via linux/fs.h -+ -+have_fsxattr=no -+cat > $TMPC << EOF -+#include <linux/fs.h> -+struct fsxattr foo; -+int main(void) { -+ return 0; -+} -+EOF -+if compile_prog "" "" ; then -+ have_fsxattr=yes -+fi -+ -+########################################## - # End of CC checks - # After here, no more $cc or $ld runs - -@@ -5160,6 +5175,14 @@ fi - if test "$have_ifaddrs_h" = "yes" ; then - echo "HAVE_IFADDRS_H=y" >> $config_host_mak - fi -+ -+# Work around a system header bug with some kernel/XFS header -+# versions where they both try to define 'struct fsxattr': -+# xfs headers will not try to redefine structs from linux headers -+# if this macro is set. -+if test "$have_fsxattr" = "yes" ; then -+ echo "HAVE_FSXATTR=y" >> $config_host_mak -+fi - if test "$vte" = "yes" ; then - echo "CONFIG_VTE=y" >> $config_host_mak - echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak --- -2.8.2 - diff --git a/app-emulation/qemu/qemu-2.5.1.ebuild b/app-emulation/qemu/qemu-2.5.1.ebuild deleted file mode 100644 index 6148c72..00000000 --- a/app-emulation/qemu/qemu-2.5.1.ebuild +++ /dev/null @@ -1,693 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="ncurses,readline" - -PLOCALES="de_DE fr_FR hu it tr zh_CN" - -inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ - user udev fcaps readme.gentoo pax-utils l10n - -BACKPORTS= - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.qemu.org/qemu.git" - inherit git-2 - SRC_URI="" -else - SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2 - ${BACKPORTS:+ - https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"; - KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd" -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 bzip2 +caps +curl debug +fdt glusterfs \ -gnutls gtk gtk2 infiniband iscsi +jpeg \ -kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs -+png pulseaudio python \ -rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu -static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net \ -virgl virtfs +vnc vte 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 tricore xtensa xtensaeb" -IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" - -use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) -use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - gtk2? ( gtk ) - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - sdl2? ( sdl ) - static? ( static-softmmu static-user ) - static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 ) - virtfs? ( xattr ) - vte? ( gtk )" - -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# respected). This is because qemu supports using the C library's API -# when available rather than always using the extranl library. -# -# Older versions of gnutls are supported, but it's simpler to just require -# the latest versions. This is also why we require nettle. -# -# TODO: Split out tools deps into another var. e.g. bzip2 is only used by -# system binaries and tools, not user binaries. -COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)] - bzip2? ( app-arch/bzip2[static-libs(+)] ) - xattr? ( sys-apps/attr[static-libs(+)] )" -SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( app-accessibility/brltty[static-libs(+)] ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bluetooth? ( net-wireless/bluez ) - 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(+)] ) - gnutls? ( - dev-libs/nettle:=[static-libs(+)] - >=net-libs/gnutls-3.0:=[static-libs(+)] - ) - gtk? ( - gtk2? ( - x11-libs/gtk+:2 - vte? ( x11-libs/vte:0 ) - ) - !gtk2? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.90 ) - ) - ) - infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) - iscsi? ( net-libs/libiscsi ) - jpeg? ( virtual/jpeg:0=[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - ncurses? ( sys-libs/ncurses:0=[static-libs(+)] ) - nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl,gles2] - ) - png? ( media-libs/libpng:0=[static-libs(+)] ) - pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - !sdl2? ( - media-libs/libsdl[X] - >=media-libs/libsdl-1.2.11[static-libs(+)] - ) - sdl2? ( - media-libs/libsdl2[X] - media-libs/libsdl2[static-libs(+)] - ) - ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) - smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) - snappy? ( app-arch/snappy[static-libs(+)] ) - spice? ( - >=app-emulation/spice-protocol-0.12.3 - >=app-emulation/spice-0.12.0[static-libs(+)] - ) - ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) - usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) - usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) - vde? ( net-misc/vde[static-libs(+)] ) - virgl? ( media-libs/virglrenderer[static-libs(+)] ) - virtfs? ( sys-libs/libcap ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] )" -USER_LIB_DEPEND="${COMMON_LIB_DEPEND}" -X86_FIRMWARE_DEPEND=" - >=sys-firmware/ipxe-1.0.0_p20130624 - pin-upstream-blobs? ( - ~sys-firmware/seabios-1.8.2 - ~sys-firmware/sgabios-0.1_pre8 - ~sys-firmware/vgabios-0.7a - ) - !pin-upstream-blobs? ( - sys-firmware/seabios - sys-firmware/sgabios - sys-firmware/vgabios - )" -CDEPEND=" - !static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) ) - !static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) ) - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) - xen? ( app-emulation/xen-tools:= )" -DEPEND="${CDEPEND} - dev-lang/perl - =dev-lang/python-2* - sys-apps/texinfo - virtual/pkgconfig - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - gtk? ( nls? ( sys-devel/gettext ) ) - static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) ) - static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-qemu ) -" - -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 - usr/share/qemu/u-boot.e500 -" - -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.\n\n -For brand new installs, the default permissions on /dev/kvm might not let you -access it. You can tell udev to reset ownership/perms:\n -udevadm trigger -c add /dev/kvm" - -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 -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/default-configs >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -handle_locales() { - # Make sure locale list is kept up-to-date. - local detected sorted - detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u)) - sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "PLOCALES: ${sorted}" - eerror " po/*.po: ${detected}" - die "sync PLOCALES" - fi - - # Deal with selective install of locales. - if use nls ; then - # Delete locales the user does not want. #577814 - rm_loc() { rm po/$1.po || die; } - l10n_for_each_disabled_locale_do rm_loc - else - # Cheap hack to disable gettext .mo generation. - rm -f po/*.po - fi -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - # 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-2.5.0-cflags.patch - [[ -n ${BACKPORTS} ]] && \ - EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ - epatch - - epatch "${FILESDIR}"/${PN}-2.5.0-CVE-2016-2198.patch #573314 - epatch "${FILESDIR}"/${PN}-2.5.0-rng-stack-corrupt-{0,1,2,3}.patch #576420 - epatch "${FILESDIR}"/${PN}-2.5.1-stellaris_enet-overflow.patch #579614 - epatch "${FILESDIR}"/${PN}-2.5.1-CVE-2016-4020.patch #580040 - epatch "${FILESDIR}"/${PN}-2.5.1-CVE-2015-8558.patch #568246 #580426 - epatch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch - epatch "${FILESDIR}"/${PN}-2.5.1-xfs-linux-headers.patch #577810 - - # Fix ld and objcopy being called directly - tc-export AR LD OBJCOPY - - # Verbose builds - MAKEOPTS+=" V=1" - - epatch_user - - # Run after we've applied all patches. - handle_locales -} - -## -# 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="${S}/${buildtype}-build" - local static_flag="static-${buildtype}" - - mkdir "${builddir}" - - 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 - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --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) - $(use_enable xattr attr) - ) - - # Disable options not used by user targets as the default configure - # options will autoprobe and try to link in a bunch of unused junk. - conf_softmmu() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - conf_opts+=( - $(conf_softmmu accessibility brlapi) - $(conf_softmmu aio linux-aio) - $(conf_softmmu bzip2) - $(conf_softmmu bluetooth bluez) - $(conf_softmmu caps cap-ng) - $(conf_softmmu curl) - $(conf_softmmu fdt) - $(conf_softmmu glusterfs) - $(conf_softmmu gnutls) - $(conf_softmmu gnutls nettle) - $(conf_softmmu gtk) - $(conf_softmmu infiniband rdma) - $(conf_softmmu iscsi libiscsi) - $(conf_softmmu jpeg vnc-jpeg) - $(conf_softmmu kernel_linux kvm) - $(conf_softmmu lzo) - $(conf_softmmu ncurses curses) - $(conf_softmmu nfs libnfs) - $(conf_softmmu numa) - $(conf_softmmu opengl) - $(conf_softmmu png vnc-png) - $(conf_softmmu rbd) - $(conf_softmmu sasl vnc-sasl) - $(conf_softmmu sdl) - $(conf_softmmu seccomp) - $(conf_softmmu smartcard) - $(conf_softmmu snappy) - $(conf_softmmu spice) - $(conf_softmmu ssh libssh2) - $(conf_softmmu usb libusb) - $(conf_softmmu usbredir usb-redir) - $(conf_softmmu uuid) - $(conf_softmmu vde) - $(conf_softmmu vhost-net) - $(conf_softmmu virgl virglrenderer) - $(conf_softmmu virtfs) - $(conf_softmmu vnc) - $(conf_softmmu vte) - $(conf_softmmu xen) - $(conf_softmmu xen xen-pci-passthrough) - $(conf_softmmu xfs xfsctl) - ) - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-blobs - --disable-tools - ) - ;; - softmmu) - # 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}" - - conf_opts+=( - --disable-linux-user - --enable-system - --with-system-pixman - --audio-drv-list="${audio_opts}" - ) - use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) - use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --disable-blobs - $(use_enable bzip2) - ) - static_flag="static" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # 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 - - echo "../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_setup - - 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 - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - [[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - default - fi - - if [[ -z ${softmmu_targets}${user_targets} ]]; then - cd "${S}/tools-build" - default - fi -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - pax-mark m */qemu-system-* #515550 - 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 - - if [[ -z ${softmmu_targets}${user_targets} ]]; then - cd "${S}/tools-build" - emake DESTDIR="${ED}" install - 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/" || die - - cd "${S}" - dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt - newdoc pc-bios/README README.pc-bios - dodoc docs/qmp-*.txt - - if [[ -n ${softmmu_targets} ]]; then - # 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 - fi - - qemu_support_kvm && readme.gentoo_create_doc -} - -pkg_postinst() { - if qemu_support_kvm; then - readme.gentoo_print_elog - fi - - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - fcaps cap_net_admin /usr/libexec/qemu-bridge-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)" -}
