提交 45e00c7f 编写于 作者: M Marc Hartmayer 提交者: John Ferlan

rpc: Fix deadlock if there is no worker pool available

@srv must be unlocked for the call virNetServerProcessMsg otherwise a
deadlock can occur.

Since the pointer 'srv->workers' will never be changed after
initialization and the thread pool has it's own locking we can release
the lock of 'srv' earlier. This also fixes the deadlock.
Signed-off-by: NMarc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: NBoris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: NBjoern Walk <bwalk@linux.ibm.com>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
上级 80250f70
...@@ -51,6 +51,7 @@ struct _virNetServer { ...@@ -51,6 +51,7 @@ struct _virNetServer {
char *name; char *name;
/* Immutable pointer, self-locking APIs */
virThreadPoolPtr workers; virThreadPoolPtr workers;
char *mdnsGroupName; char *mdnsGroupName;
...@@ -177,9 +178,11 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque) ...@@ -177,9 +178,11 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque)
VIR_FREE(job); VIR_FREE(job);
} }
static void virNetServerDispatchNewMessage(virNetServerClientPtr client,
virNetMessagePtr msg, static void
void *opaque) virNetServerDispatchNewMessage(virNetServerClientPtr client,
virNetMessagePtr msg,
void *opaque)
{ {
virNetServerPtr srv = opaque; virNetServerPtr srv = opaque;
virNetServerProgramPtr prog = NULL; virNetServerProgramPtr prog = NULL;
...@@ -196,6 +199,11 @@ static void virNetServerDispatchNewMessage(virNetServerClientPtr client, ...@@ -196,6 +199,11 @@ static void virNetServerDispatchNewMessage(virNetServerClientPtr client,
break; break;
} }
} }
/* we can unlock @srv since @prog can only become invalid in case
* of disposing @srv, but let's grab a ref first to ensure nothing
* disposes of it before we use it. */
virObjectRef(srv);
virObjectUnlock(srv);
if (srv->workers) { if (srv->workers) {
virNetServerJobPtr job; virNetServerJobPtr job;
...@@ -223,15 +231,16 @@ static void virNetServerDispatchNewMessage(virNetServerClientPtr client, ...@@ -223,15 +231,16 @@ static void virNetServerDispatchNewMessage(virNetServerClientPtr client,
goto error; goto error;
} }
virObjectUnlock(srv); virObjectUnref(srv);
return; return;
error: error:
virNetMessageFree(msg); virNetMessageFree(msg);
virNetServerClientClose(client); virNetServerClientClose(client);
virObjectUnlock(srv); virObjectUnref(srv);
} }
/** /**
* virNetServerCheckLimits: * virNetServerCheckLimits:
* @srv: server to check limits on * @srv: server to check limits on
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册