From e80ab9fe75c7496067704981f30ccbb2c7323402 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mar 21 2019 11:47:17 +0000 Subject: Drop one pvrdma patch which needs more backports --- diff --git a/0019-pvrdma-release-device-resources-in-case-of-an-error.patch b/0019-pvrdma-release-device-resources-in-case-of-an-error.patch deleted file mode 100644 index 96db184..0000000 --- a/0019-pvrdma-release-device-resources-in-case-of-an-error.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Prasad J Pandit -Date: Wed, 12 Dec 2018 23:28:17 +0530 -Subject: [PATCH] pvrdma: release device resources in case of an error - -If during pvrdma device initialisation an error occurs, -pvrdma_realize() does not release memory resources, leading -to memory leakage. - -Reported-by: Li Qiang -Signed-off-by: Prasad J Pandit -Message-Id: <20181212175817.815-1-ppandit@redhat.com> -Reviewed-by: Yuval Shaia -Signed-off-by: Marcel Apfelbaum -(cherry picked from commit cce648613bc802be1b894227f7fd94d88476ea07) ---- - 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 3ed7409763..2a43dca714 100644 ---- a/hw/rdma/vmw/pvrdma_main.c -+++ b/hw/rdma/vmw/pvrdma_main.c -@@ -538,7 +538,7 @@ static int pvrdma_check_ram_shared(Object *obj, 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; -@@ -596,6 +596,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp) - - out: - if (rc) { -+ pvrdma_fini(pdev); - error_append_hint(errp, "Device fail to load\n"); - } - } diff --git a/qemu.spec b/qemu.spec index 5c96c79..7a4275a 100644 --- a/qemu.spec +++ b/qemu.spec @@ -163,8 +163,6 @@ Patch0016: 0016-9p-fix-QEMU-crash-when-renaming-files.patch # CVE-2018-16867: usb-mtp: path traversal issue (bz #1656746) Patch0017: 0017-usb-mtp-fix-utf16_to_str.patch Patch0018: 0018-usb-mtp-outlaw-slashes-in-filenames.patch -# CVE-2018-20123: pvrdma: memory leakage in device hotplug (bz #1658964) -Patch0019: 0019-pvrdma-release-device-resources-in-case-of-an-error.patch # CVE-2018-16872: usb-mtp: path traversal issue (bz #1659150) Patch0020: 0020-usb-mtp-use-O_NOFOLLOW-and-O_CLOEXEC.patch # CVE-2018-20191: pvrdma: uar_read leads to NULL deref (bz #1660315) @@ -1648,7 +1646,6 @@ getent passwd qemu >/dev/null || \ - CVE-2018-19364: 9pfs: use-after-free (bz #1651359) - CVE-2018-19489: 9pfs: use-after-free renaming files (bz #1653157) - CVE-2018-16867: usb-mtp: path traversal issue (bz #1656746) -- CVE-2018-20123: pvrdma: memory leakage in device hotplug (bz #1658964) - CVE-2018-16872: usb-mtp: path traversal issue (bz #1659150) - CVE-2018-20191: pvrdma: uar_read leads to NULL deref (bz #1660315) - CVE-2019-6778: slirp: heap buffer overflow (bz #1669072)