update to qemu-2.9.0-rc2

[pve-qemu-kvm.git] / debian / patches / extra / CVE-2016-9916-9pfs-add-cleanup-operation-for-proxy-backend-driver.patch

diff --git a/debian/patches/extra/CVE-2016-9916-9pfs-add-cleanup-operation-for-proxy-backend-driver.patch b/debian/patches/extra/CVE-2016-9916-9pfs-add-cleanup-operation-for-proxy-backend-driver.patch
deleted file mode 100644 (file)
index 78c49cb..0000000
--- a/debian/patches/extra/CVE-2016-9916-9pfs-add-cleanup-operation-for-proxy-backend-driver.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ae9b5c9dae96dd8d3bdf9bb6b9a0f7a2d6f532f7 Mon Sep 17 00:00:00 2001
-From: Li Qiang <liq3ea@gmail.com>
-Date: Wed, 23 Nov 2016 13:53:34 +0100
-Subject: [PATCH 09/12] 9pfs: add cleanup operation for proxy backend driver
-
-In the init operation of proxy backend dirver, it allocates a
-V9fsProxy struct and some other resources. We should free these
-resources when the 9pfs device is unrealized. This is what this
-patch does.
-
-Signed-off-by: Li Qiang <liq3ea@gmail.com>
-Reviewed-by: Greg Kurz <groug@kaod.org>
-Signed-off-by: Greg Kurz <groug@kaod.org>
----
- hw/9pfs/9p-proxy.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
-index f265501..336e9fe 100644
---- a/hw/9pfs/9p-proxy.c
-+++ b/hw/9pfs/9p-proxy.c
-@@ -1179,9 +1179,22 @@ static int proxy_init(FsContext *ctx)
-     return 0;
- }
- 
-+static void proxy_cleanup(FsContext *ctx)
-+{
-+    V9fsProxy *proxy = ctx->private;
-+
-+    g_free(proxy->out_iovec.iov_base);
-+    g_free(proxy->in_iovec.iov_base);
-+    if (ctx->export_flags & V9FS_PROXY_SOCK_NAME) {
-+        close(proxy->sockfd);
-+    }
-+    g_free(proxy);
-+}
-+
- FileOperations proxy_ops = {
-     .parse_opts   = proxy_parse_opts,
-     .init         = proxy_init,
-+    .cleanup      = proxy_cleanup,
-     .lstat        = proxy_lstat,
-     .readlink     = proxy_readlink,
-     .close        = proxy_close,
--- 
-2.1.4
-