summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2018-12-19 15:11:21 -0600
committerMatthias Maier <tamiko@gentoo.org>2018-12-19 15:46:41 -0600
commit40e4d2a3c32609b313962224ee9d2a96075734b8 (patch)
tree83c14940a312e6e320c8da727817f550d3313e7a /app-emulation/qemu/files
parentnet-misc/openvswitch: fix confd typo (diff)
downloadgentoo-40e4d2a3c32609b313962224ee9d2a96075734b8.tar.gz
gentoo-40e4d2a3c32609b313962224ee9d2a96075734b8.tar.bz2
gentoo-40e4d2a3c32609b313962224ee9d2a96075734b8.zip
app-emulation/qemu: version bump to 3.1.0
- use RESTRICT=strip, bug #651422 - switch to tar.xz, bug #666726 - add missing use constraints, bug #664474 qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) - 3.1.0 already contains patches for CVE-2018-15746 - applied patch for CVE-2018-20123 - disable bt subsystem entirely as a "workaround" for CVE-2018-19665. Upstream deprecated the subsystem in November and states that it had been dysfunctional for years with likely no users. Bug: https://bugs.gentoo.org/664740 Bug: https://bugs.gentoo.org/672346 Bug: https://bugs.gentoo.org/673108 Closes: https://bugs.gentoo.org/651422 Closes: https://bugs.gentoo.org/664474 Closes: https://bugs.gentoo.org/666726 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'app-emulation/qemu/files')
-rw-r--r--app-emulation/qemu/files/qemu-3.1.0-CVE-2018-20123.patch35
-rw-r--r--app-emulation/qemu/files/qemu-binfmt.initd.head2
2 files changed, 36 insertions, 1 deletions
diff --git a/app-emulation/qemu/files/qemu-3.1.0-CVE-2018-20123.patch b/app-emulation/qemu/files/qemu-3.1.0-CVE-2018-20123.patch
new file mode 100644
index 000000000000..a021a6a970d2
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-3.1.0-CVE-2018-20123.patch
@@ -0,0 +1,35 @@
+From: Prasad J Pandit <address@hidden>
+
+If during pvrdma device initialisation an error occurs,
+pvrdma_realize() does not release memory resources, leading
+to memory leakage.
+
+Reported-by: Li Qiang <address@hidden>
+Signed-off-by: Prasad J Pandit <address@hidden>
+---
+ hw/rdma/vmw/pvrdma_main.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
+index 8a03ab4669..b65f8662df 100644
+--- a/hw/rdma/vmw/pvrdma_main.c
++++ b/hw/rdma/vmw/pvrdma_main.c
+@@ -579,7 +579,7 @@ static void pvrdma_shutdown_notifier(Notifier *n, void *opaque)
+
+ static void pvrdma_realize(PCIDevice *pdev, Error **errp)
+ {
+- int rc;
++ int rc = 0;
+ PVRDMADev *dev = PVRDMA_DEV(pdev);
+ Object *memdev_root;
+ bool ram_shared = false;
+@@ -655,6 +655,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)
+
+ out:
+ if (rc) {
++ pvrdma_fini(pdev);
+ error_append_hint(errp, "Device fail to load\n");
+ }
+ }
+--
+2.19.2
diff --git a/app-emulation/qemu/files/qemu-binfmt.initd.head b/app-emulation/qemu/files/qemu-binfmt.initd.head
index 858d5d745381..832ddb0b8e57 100644
--- a/app-emulation/qemu/files/qemu-binfmt.initd.head
+++ b/app-emulation/qemu/files/qemu-binfmt.initd.head
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Enable automatic non-native program execution by the kernel.