From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 18 Feb 2013 14:10:04 +0000 (+0100)
Subject: rpc: Avoid deadlock when closing client connection
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=921af42980cb75e550d562654b2ad12b851b36cb;p=libvirt.git

rpc: Avoid deadlock when closing client connection

We need to drop the server lock before calling virObjectUnlock(client)
since in case we had the last reference to the client, its dispose
callback would be called and that could possibly try to lock the server
and cause a deadlock. This is exactly what happens when there is only
one QEMU domain running and it is marked to be autodestroyed when the
connection dies. This results in qemuProcessAutoDestroy ->
qemuProcessStop -> virNetServerRemoveShutdownInhibition call sequence,
where the last function locks the server.
---

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 95333d0cc3..e536cc30ee 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -1120,7 +1120,7 @@ void virNetServerRun(virNetServerPtr srv)
             if (virNetServerClientWantClose(srv->clients[i]))
                 virNetServerClientClose(srv->clients[i]);
             if (virNetServerClientIsClosed(srv->clients[i])) {
-                virObjectUnref(srv->clients[i]);
+                virNetServerClientPtr client = srv->clients[i];
                 if (srv->nclients > 1) {
                     memmove(srv->clients + i,
                             srv->clients + i + 1,
@@ -1131,6 +1131,10 @@ void virNetServerRun(virNetServerPtr srv)
                     srv->nclients = 0;
                 }
 
+                virObjectUnlock(srv);
+                virObjectUnref(client);
+                virObjectLock(srv);
+
                 goto reprocess;
             }
         }