From: John Wolfe <jwolfe@vmware.com>
Date: Mon, 9 Nov 2020 20:29:03 +0000 (-0800)
Subject: Service Discovrey: Fix a task thread and child process deadlock.
X-Git-Tag: stable-11.3.0~260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f775ee10e6be1714b7fc3cf79037fdca6916a689;p=thirdparty%2Fopen-vm-tools.git

Service Discovrey: Fix a task thread and child process deadlock.

Correct argument order in a warning message.
---

diff --git a/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscoveryPosix.c b/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscoveryPosix.c
index 1220948b0..3501be71c 100644
--- a/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscoveryPosix.c
+++ b/open-vm-tools/services/plugins/serviceDiscovery/serviceDiscoveryPosix.c
@@ -114,7 +114,6 @@ PublishScriptOutputToNamespaceDB(ToolsAppCtx *ctx,
                                  const char *script)
 {
    Bool status = FALSE;
-   Bool stdoutIsEmpty = TRUE;
    GPid pid;
    gchar *command = g_strdup(script);
    gchar *cmd[] = { command, NULL };
@@ -130,8 +129,8 @@ PublishScriptOutputToNamespaceDB(ToolsAppCtx *ctx,
                                      &p_error);
    if (!status) {
       if (p_error != NULL) {
-         g_warning("%s: Error during script exec %s\n", p_error->message,
-                   __FUNCTION__);
+         g_warning("%s: Error during script exec %s\n", __FUNCTION__,
+                   p_error->message);
          g_error_free(p_error);
       } else {
          g_warning("%s: Command not run\n", __FUNCTION__);
@@ -146,24 +145,30 @@ PublishScriptOutputToNamespaceDB(ToolsAppCtx *ctx,
    if (child_stdout_f == NULL) {
       g_warning("%s: Failed to create file stream for child stdout, errno=%d",
                 __FUNCTION__, errno);
+      status = FALSE;
       goto out;
    }
 
-   status = FALSE;
    for (;;) {
       char buf[SERVICE_DISCOVERY_VALUE_MAX_SIZE];
       size_t readBytes = fread(buf, 1, sizeof(buf), child_stdout_f);
 
-      g_debug("%s: readBytes = %" G_GSSIZE_FORMAT "\n", __FUNCTION__, readBytes);
-
-      if (readBytes > 0) {
+      g_debug("%s: readBytes = %" G_GSSIZE_FORMAT " status = %s\n",
+              __FUNCTION__, readBytes, status ? "TRUE" : "FALSE");
+      // At first iteration we are sure that status is true
+      if (status && readBytes > 0) {
          gchar* msg = g_strdup_printf("%s-%d", key, ++i);
-         stdoutIsEmpty = FALSE;
          status = WriteData(ctx, msg, buf, readBytes);
+         if (!status) {
+             g_warning("%s: Failed to store data\n", __FUNCTION__);
+         }
          g_free(msg);
       }
 
-      if (!status || readBytes < sizeof(buf)) {
+      if (readBytes < sizeof(buf)) {
+         if (!status) {
+            g_warning("%s: Data read finished but failed to store\n", __FUNCTION__);
+         }
          break;
       }
    }
@@ -175,8 +180,6 @@ PublishScriptOutputToNamespaceDB(ToolsAppCtx *ctx,
          g_debug("%s: Written key %s chunks %s\n", __FUNCTION__, key, chunkCount);
       }
       g_free(chunkCount);
-   } else if (!stdoutIsEmpty) {
-      g_warning("%s: Was not able to capture or store data\n", __FUNCTION__);
    }
 
    DynBuf_Init(&err);