[PATCH 1/7] Change calling conventions in remote driver client internals

["Daniel P. Berrange" <berrange@xxxxxxxxxx>]

The remoteIO() method has wierd calling conventions, where
it is passed a pre-allocated 'struct remote_call *' but
then free()s it itself, instead of letting the caller free().
This fixes those wierd semantics

* src/remote/remote_driver.c: Santize semantics of remoteIO
  method wrt to memory release
---
 src/remote/remote_driver.c |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index cb0d8e1..fd761c8 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -7972,6 +7972,7 @@ remoteStreamPacket(virStreamPtr st,
     XDR xdr;
     struct remote_thread_call *thiscall;
     remote_message_header hdr;
+    int ret;
 
     memset(&hdr, 0, sizeof hdr);
 
@@ -8041,8 +8042,9 @@ remoteStreamPacket(virStreamPtr st,
     }
     xdr_destroy (&xdr);
 
-    /* remoteIO frees 'thiscall' for us (XXX that's dubious semantics) */
-    if (remoteIO(st->conn, priv, 0, thiscall) < 0)
+    ret = remoteIO(st->conn, priv, 0, thiscall);
+    VIR_FREE(thiscall);
+    if (ret < 0)
         return -1;
 
     return nbytes;
@@ -8150,6 +8152,7 @@ remoteStreamRecv(virStreamPtr st,
 
     if (!privst->incomingOffset) {
         struct remote_thread_call *thiscall;
+        int ret;
 
         if (VIR_ALLOC(thiscall) < 0) {
             virReportOOMError();
@@ -8170,8 +8173,9 @@ remoteStreamRecv(virStreamPtr st,
             goto cleanup;
         }
 
-        /* remoteIO frees 'thiscall' for us (XXX that's dubious semantics) */
-        if (remoteIO(st->conn, priv, 0, thiscall) < 0)
+        ret = remoteIO(st->conn, priv, 0, thiscall);
+        VIR_FREE(thiscall);
+        if (ret < 0)
             goto cleanup;
     }
 
@@ -9872,12 +9876,10 @@ remoteIO(virConnectPtr conn,
             remoteError(VIR_ERR_INTERNAL_ERROR,
                         _("failed to wake up polling thread: %s"),
                         virStrerror(errno, errout, sizeof errout));
-            VIR_FREE(thiscall);
             return -1;
         } else if (s != sizeof(ignore)) {
             remoteError(VIR_ERR_INTERNAL_ERROR, "%s",
                         _("failed to wake up polling thread"));
-            VIR_FREE(thiscall);
             return -1;
         }
 
@@ -9897,7 +9899,6 @@ remoteIO(virConnectPtr conn,
             }
             remoteError(VIR_ERR_INTERNAL_ERROR, "%s",
                         _("failed to wait on condition"));
-            VIR_FREE(thiscall);
             return -1;
         }
 
@@ -9948,10 +9949,8 @@ remoteIO(virConnectPtr conn,
     if (priv->watch >= 0)
         virEventUpdateHandle(priv->watch, VIR_EVENT_HANDLE_READABLE);
 
-    if (rv < 0) {
-        VIR_FREE(thiscall);
+    if (rv < 0)
         return -1;
-    }
 
 cleanup:
     DEBUG("All done with our call %d %p %p", thiscall->proc_nr, priv->waitDispatch, thiscall);
@@ -10004,7 +10003,6 @@ cleanup:
     } else {
         rv = 0;
     }
-    VIR_FREE(thiscall);
     return rv;
 }
 
@@ -10021,6 +10019,7 @@ call (virConnectPtr conn, struct private_data *priv,
       xdrproc_t ret_filter, char *ret)
 {
     struct remote_thread_call *thiscall;
+    int rv;
 
     thiscall = prepareCall(priv, flags, proc_nr, args_filter, args,
                            ret_filter, ret);
@@ -10030,7 +10029,9 @@ call (virConnectPtr conn, struct private_data *priv,
         return -1;
     }
 
-    return remoteIO(conn, priv, flags, thiscall);
+    rv = remoteIO(conn, priv, flags, thiscall);
+    VIR_FREE(thiscall);
+    return rv;
 }
 
 
-- 
1.7.2.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list