X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=debian%2Fpatches%2Fextra%2FCVE-2016-9913-9pfs-adjust-the-order-of-resource-cleanup-in-device-.patch;fp=debian%2Fpatches%2Fextra%2FCVE-2016-9913-9pfs-adjust-the-order-of-resource-cleanup-in-device-.patch;h=0000000000000000000000000000000000000000;hb=1a91ab45b7b886b5a4d2b12a559e4b239eccceed;hp=9db7466fa804552b537c498a9cac6b1ab3edbb8b;hpb=e9748910af967b15cce8c312fc50589065fca911;p=pve-qemu-kvm.git diff --git a/debian/patches/extra/CVE-2016-9913-9pfs-adjust-the-order-of-resource-cleanup-in-device-.patch b/debian/patches/extra/CVE-2016-9913-9pfs-adjust-the-order-of-resource-cleanup-in-device-.patch deleted file mode 100644 index 9db7466..0000000 --- a/debian/patches/extra/CVE-2016-9913-9pfs-adjust-the-order-of-resource-cleanup-in-device-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9be364d4b3bc173103bec0dc76259f40d232eb88 Mon Sep 17 00:00:00 2001 -From: Li Qiang -Date: Wed, 23 Nov 2016 13:53:34 +0100 -Subject: [PATCH 06/12] 9pfs: adjust the order of resource cleanup in device - unrealize - -Unrealize should undo things that were set during realize in -reverse order. So should do in the error path in realize. - -Signed-off-by: Li Qiang -Reviewed-by: Greg Kurz -Signed-off-by: Greg Kurz ---- - hw/9pfs/9p.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c -index fc4f2cd..ced7b4c 100644 ---- a/hw/9pfs/9p.c -+++ b/hw/9pfs/9p.c -@@ -3490,8 +3490,8 @@ int v9fs_device_realize_common(V9fsState *s, Error **errp) - rc = 0; - out: - if (rc) { -- g_free(s->ctx.fs_root); - g_free(s->tag); -+ g_free(s->ctx.fs_root); - v9fs_path_free(&path); - } - return rc; -@@ -3499,8 +3499,8 @@ out: - - void v9fs_device_unrealize_common(V9fsState *s, Error **errp) - { -- g_free(s->ctx.fs_root); - g_free(s->tag); -+ g_free(s->ctx.fs_root); - } - - static void __attribute__((__constructor__)) v9fs_set_fd_limit(void) --- -2.1.4 -