<div dir="ltr">Previous patch can not pass build because of missing virNetServerClientCheckFilterExist stated in libvirt_remote.syms</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">LanceLiu <<a href="mailto:liu.lance.89@gmail.com">liu.lance.89@gmail.com</a>> 于2019年11月25日周一 下午3:34写道：<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">---<br>
 src/libvirt_remote.syms           |  1 +<br>
 src/remote/remote_daemon_stream.c | 10 +++++++++-<br>
 src/rpc/virnetserverclient.c      | 12 ++++++++++++<br>
 src/rpc/virnetserverclient.h      |  2 ++<br>
 4 files changed, 24 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms<br>
index 0493467..c32e234 100644<br>
--- a/src/libvirt_remote.syms<br>
+++ b/src/libvirt_remote.syms<br>
@@ -173,6 +173,7 @@ virNetServerClientPreExecRestart;<br>
 virNetServerClientRemoteAddrStringSASL;<br>
 virNetServerClientRemoteAddrStringURI;<br>
 virNetServerClientRemoveFilter;<br>
+virNetServerClientCheckFilterExist;<br>
 virNetServerClientSendMessage;<br>
 virNetServerClientSetAuthLocked;<br>
 virNetServerClientSetAuthPendingLocked;<br>
diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c<br>
index 82cadb6..de0dca3 100644<br>
--- a/src/remote/remote_daemon_stream.c<br>
+++ b/src/remote/remote_daemon_stream.c<br>
@@ -292,10 +292,18 @@ daemonStreamFilter(virNetServerClientPtr client,<br>
 {<br>
     daemonClientStream *stream = opaque;<br>
     int ret = 0;<br>
+    daemonClientPrivatePtr priv = NULL;<br>
+    int filter_id = stream->filterID;<br>
<br>
     virObjectUnlock(client);<br>
+    priv = virNetServerClientGetPrivateData(client);<br>
     virMutexLock(&stream->priv->lock);<br>
     virObjectLock(client);<br>
+    if (!virNetServerClientCheckFilterExist(client, filter_id)) {<br>
+        VIR_WARN("this daemon stream filter: %d have been deleted!", filter_id);<br>
+        ret = -1;<br>
+        goto cleanup;<br>
+    }<br>
<br>
     if (msg->header.type != VIR_NET_STREAM &&<br>
         msg->header.type != VIR_NET_STREAM_HOLE)<br>
@@ -317,7 +325,7 @@ daemonStreamFilter(virNetServerClientPtr client,<br>
     ret = 1;<br>
<br>
  cleanup:<br>
-    virMutexUnlock(&stream->priv->lock);<br>
+    virMutexUnlock(&priv->lock);<br>
     return ret;<br>
 }<br>
<br>
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c<br>
index 67b3bf9..f80f493 100644<br>
--- a/src/rpc/virnetserverclient.c<br>
+++ b/src/rpc/virnetserverclient.c<br>
@@ -287,6 +287,18 @@ void virNetServerClientRemoveFilter(virNetServerClientPtr client,<br>
     virObjectUnlock(client);<br>
 }<br>
<br>
+int virNetServerClientCheckFilterExist(virNetServerClientPtr client,<br>
+                                       int filterID)<br>
+{<br>
+    virNetServerClientFilterPtr tmp;<br>
+<br>
+    tmp = client->filters;<br>
+    while(tmp && tmp->id != filterID) {<br>
+        tmp = tmp->next;<br>
+    }<br>
+<br>
+    return (tmp != NULL);<br>
+}<br>
<br>
 /* Check the client's access. */<br>
 static int<br>
diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h<br>
index 7a3061d..85fda39 100644<br>
--- a/src/rpc/virnetserverclient.h<br>
+++ b/src/rpc/virnetserverclient.h<br>
@@ -93,6 +93,8 @@ int virNetServerClientAddFilter(virNetServerClientPtr client,<br>
<br>
 void virNetServerClientRemoveFilter(virNetServerClientPtr client,<br>
                                     int filterID);<br>
+int virNetServerClientCheckFilterExist(virNetServerClientPtr client,<br>
+                                       int filterID);<br>
<br>
 int virNetServerClientGetAuth(virNetServerClientPtr client);<br>
 void virNetServerClientSetAuthLocked(virNetServerClientPtr client, int auth);<br>
-- <br>
1.8.3.1<br>
<br>
</blockquote></div>