Subject: [PATCH 08/16] vhost-user: disable chardev handlers on close

From: Marc-André Lureau <[email-masked]>
Date: Mon, 4 Jul 2016 20:57:28 +0200

RH-Author: Marc-André Lureau <[email-masked]>
Message-id: <[email-masked]>
Patchwork-id: 70938
O-Subject: [RHEV-7.3 qemu-kvm-rhev PATCH v2 1/5] vhost-user: disable chardev handlers on close
Bugzilla: 1347077
RH-Acked-by: Xiao Wang <[email-masked]>
RH-Acked-by: Laurent Vivier <[email-masked]>
RH-Acked-by: Victor Kaplansky <[email-masked]>
RH-Acked-by: Paolo Bonzini <[email-masked]>

From: Paolo Bonzini <[email-masked]>

This otherwise causes a use-after-free if network backend cleanup
is performed before character device cleanup.

Cc: Marc-André Lureau <[email-masked]>
Signed-off-by: Paolo Bonzini <[email-masked]>

(cherry picked from commit 25f0d2aa5e3d21caa1bc622b21368cc2e383f02c)
Signed-off-by: Marc-André Lureau <[email-masked]>
Signed-off-by: Miroslav Rezanina <[email-masked]>
---
 net/vhost-user.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/net/vhost-user.c b/net/vhost-user.c
index d72ce9b..9402b9c 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -151,6 +151,11 @@ static void vhost_user_cleanup(NetClientState *nc)
         vhost_net_cleanup(s->vhost_net);
         s->vhost_net = NULL;
     }
+    if (s->chr) {
+        qemu_chr_add_handlers(s->chr, NULL, NULL, NULL, NULL);
+        qemu_chr_fe_release(s->chr);
+        s->chr = NULL;
+    }
 
     qemu_purge_queued_packets(nc);
 }
-- 
1.8.3.1