@@ -1,9 +1,8 @@

-diff -ru open-vm-tools-stable-10.1.5/open-vm-tools/libDeployPkg/linuxDeployment.c open-vm-tools-stable-10.1.5-modified/open-vm-tools/libDeployPkg/linuxDeployment.c

-+++ open-vm-tools-stable-10.1.5-modified/open-vm-tools/libDeployPkg/linuxDeployment.c	2017-03-03 15:55:49.921709009 -0800

-@@ -558,13 +558,17 @@

+--- open-vm-tools-10.1.5-5055683/libDeployPkg/linuxDeployment.c 2017-04-06 19:19:36.000010000 -0700

+@@ -580,13 +580,17 @@

     close(fd);

- 

+

     // Create space and copy the command

 -   *command = malloc(VMWAREDEPLOYPKG_CMD_LENGTH);

 +   *command = malloc(VMWAREDEPLOYPKG_CMD_LENGTH + 1);

@@ -11,7 +10,7 @@ diff -ru open-vm-tools-stable-10.1.5/open-vm-tools/libDeployPkg/linuxDeployment.

        SetDeployError("Error allocating memory.");

        return FALSE;

     }

- 

+

 -   memcpy(*command, hdr.command, VMWAREDEPLOYPKG_CMD_LENGTH);

 +   // will pad with '\0' if necessary

 +   strncpy(*command, hdr.command, VMWAREDEPLOYPKG_CMD_LENGTH);

@@ -20,23 +19,24 @@ diff -ru open-vm-tools-stable-10.1.5/open-vm-tools/libDeployPkg/linuxDeployment.

 +

     *archiveType = hdr.payloadType;

     *flags = hdr.reserved;

- 

-@@ -1042,6 +1046,18 @@

+

+@@ -1074,6 +1078,20 @@

        free(command);

-       deployStatus =  CloudInitSetup(EXTRACTPATH);

+       deployStatus =  CloudInitSetup(tmpDirPath);

     } else {

 +      if ((strstr(command, "scripts/Customize.pl") != NULL) || (strstr(command, "scripts/customize.sh") != NULL)) {

 +          free (command);

 +          const char* PHOTON_OS_LAUNCH_COMMAND = "/bin/bash /usr/share/open-vm-tools/GOSC/gosc-scripts/imc-shell/imgcust-scripts/customize.sh /tmp/.vmware/linux/deploy/cust.cfg";

 +

 +          // The command will be parsed alter and can be of arbitrary length

-+          command = strdup(PHOTON_OS_LAUNCH_COMMAND);

++          command = StrUtil_ReplaceAll(PHOTON_OS_LAUNCH_COMMAND, TMP_PATH_VAR, tmpDirPath);

 +          if (!command) {

 +             SetDeployError("Error allocating memory.");

 +             return DEPLOY_ERROR;

 +          }

 +          _DeployPkg_SkipReboot(true);

 +      }

-       // Run the deployment command

-       sLog(log_info, "Launching deployment %s.  \n", command);

++      // Run the deployment command

++      sLog(log_info, "Launching deployment %s.  \n", command);

        deploymentResult = ForkExecAndWaitCommand(command);

+       free(command);

new file mode 100755

@@ -0,0 +1,267 @@

+--- libDeployPkg/linuxDeployment.c	2016-10-11 14:08:49.000079000 -0400

+@@ -43,6 +43,8 @@

+ #include "mspackWrapper.h"

+ #include "rpcout.h"

+ #include "toolsDeployPkg.h"

++#include <strutil.h>

++#include <util.h>

+ 

+ /*

+  * These are covered by #ifndef to give the ability to change these

+@@ -52,12 +54,17 @@

+ 

+ #define CLEANUPCMD  "/bin/rm -r -f "

+ 

+-#ifndef EXTRACTPATH

+-#define EXTRACTPATH "/tmp/.vmware/linux/deploy"

++#ifndef TMP_PATH_VAR

++#define TMP_PATH_VAR "/tmp/.vmware/linux/deploy"

+ #endif

+ 

+-#ifndef CLEANUPPATH

+-#define CLEANUPPATH "/tmp/.vmware"

++#ifndef IMC_TMP_PATH_VAR

++#define IMC_TMP_PATH_VAR "@@IMC_TMP_PATH_VAR@@"

++#endif

++

++// '/tmp' below will be addressed by PR 1601405.

++#ifndef TMP_DIR_PATH_PATTERN

++#define TMP_DIR_PATH_PATTERN "/tmp/.vmware-imgcust-dXXXXXX"

+ #endif

+ 

+ #ifndef BASEFILENAME

+@@ -115,7 +122,6 @@

+ // Private functions

+ static Bool GetPackageInfo(const char* pkgName, char** cmd, uint8* type, uint8* flags);

+ static Bool ExtractZipPackage(const char* pkg, const char* dest);

+-static Bool CreateDir(const char *path);

+ static void Init(void);

+ static struct List* AddToList(struct List* head, const char* token);

+ static int ListSize(struct List* head);

+@@ -151,8 +157,17 @@

+ NORETURN void

+ Panic(const char *fmtstr, ...)

+ {

+-   /* Ignored */

+-   sLog(log_warning, "Panic callback invoked. \n");

++   va_list args;

++

++   char *tmp = Util_SafeMalloc(MAXSTRING);

++

++   va_start(args, fmtstr);

++   vsprintf(tmp, fmtstr, args);

++

++   sLog(log_error, "Panic callback invoked: %s\n", tmp);

++

++   free(tmp);

++

+    exit(1);

+ }

+ 

+@@ -169,12 +184,19 @@

+  *

+  **/

+ void

+-Debug(const char *fmtstr,

+-      va_list args)

++Debug(const char *fmtstr, ...)

+ {

+-   /* Ignored */

+ #ifdef VMX86_DEBUG

+-   sLog(log_warning, "Debug callback invoked. \n");

++   va_list args;

++

++   char *tmp = Util_SafeMalloc(MAXSTRING);

++

++   va_start(args, fmtstr);

++   vsprintf(tmp, fmtstr, args);

++

++   sLog(log_debug, "Debug callback invoked: %s\n", tmp);

++

++   free(tmp);

+ #endif

+ }

+ 

+@@ -979,6 +1001,7 @@

+ Deploy(const char* packageName)

+ {

+    int deployStatus = DEPLOY_SUCCESS;

++   char* pkgCommand = NULL;

+    char* command = NULL;

+    int deploymentResult = 0;

+    char *nics;

+@@ -986,6 +1009,7 @@

+    uint8 archiveType;

+    uint8 flags;

+    bool forceSkipReboot = false;

++   char *tmpDirPath;

+    Bool cloudInitEnabled = FALSE;

+    const char *cloudInitConfigFilePath = "/etc/cloud/cloud.cfg";

+    char cloudCommand[1024];

+@@ -998,33 +1022,41 @@

+                                TOOLSDEPLOYPKG_ERROR_SUCCESS,

+                                NULL);

+ 

++   tmpDirPath = mkdtemp((char *)Util_SafeStrdup(TMP_DIR_PATH_PATTERN));

++   if (tmpDirPath == NULL) {

++      SetDeployError("Error creating tmp dir: %s", strerror(errno));

++      return DEPLOY_ERROR;

++   }

++

+    sLog(log_info, "Reading cabinet file %s. \n", packageName);

+ 

+    // Get the command to execute

+-   if (!GetPackageInfo(packageName, &command, &archiveType, &flags)) {

++   if (!GetPackageInfo(packageName, &pkgCommand, &archiveType, &flags)) {

+       SetDeployError("Error extracting package header information. (%s)",

+                      GetDeployError());

++      free(tmpDirPath);

+       return DEPLOY_ERROR;

+    }

+ 

+-   // Print the header command

+-#ifdef VMX86_DEBUG

+-   sLog(log_debug, "Header command: %s \n ", command);

+-#endif

+-

+-   // create the destination directory

+-   if (!CreateDir(EXTRACTPATH "/")) {

+-      free(command);

+-      return DEPLOY_ERROR;

++   sLog(log_info, "Original deployment command: %s\n", pkgCommand);

++   if (strstr(pkgCommand, IMC_TMP_PATH_VAR) != NULL) {

++      command = StrUtil_ReplaceAll(pkgCommand, IMC_TMP_PATH_VAR, tmpDirPath);

++   } else {

++      command = StrUtil_ReplaceAll(pkgCommand, TMP_PATH_VAR, tmpDirPath);

+    }

++   free(pkgCommand);

++

++   sLog(log_info, "Actual deployment command: %s\n", command);

+ 

+    if (archiveType == VMWAREDEPLOYPKG_PAYLOAD_TYPE_CAB) {

+-      if (!ExtractCabPackage(packageName, EXTRACTPATH)) {

++      if (!ExtractCabPackage(packageName, tmpDirPath)) {

++         free(tmpDirPath);

+          free(command);

+          return DEPLOY_ERROR;

+       }

+    } else if (archiveType == VMWAREDEPLOYPKG_PAYLOAD_TYPE_ZIP) {

+-      if (!ExtractZipPackage(packageName, EXTRACTPATH)) {

++      if (!ExtractZipPackage(packageName, tmpDirPath)) {

++         free(tmpDirPath);

+          free(command);

+          return DEPLOY_ERROR;

+       }

+@@ -1040,10 +1072,8 @@

+       cloudInitEnabled = TRUE;

+       sSkipReboot = TRUE;

+       free(command);

+-      deployStatus =  CloudInitSetup(EXTRACTPATH);

++      deployStatus =  CloudInitSetup(tmpDirPath);

+    } else {

+-      // Run the deployment command

+-      sLog(log_info, "Launching deployment %s.  \n", command);

+       deploymentResult = ForkExecAndWaitCommand(command);

+       free(command);

+ 

+@@ -1089,7 +1119,7 @@

+        * of the sucess/failure of the customization so that at the end of it we

+        * always have nics enabled.

+        */

+-      nics = GetNicsToEnable(EXTRACTPATH);

++      nics = GetNicsToEnable(tmpDirPath);

+       if (nics) {

+          // XXX: Sleep before the last SetCustomizationStatusInVmx

+          //      This is a temporary-hack for PR 422790

+@@ -1104,22 +1134,23 @@

+       }

+    }

+ 

+-   cleanupCommand = malloc(strlen(CLEANUPCMD) + strlen(CLEANUPPATH) + 1);

++   cleanupCommand = malloc(strlen(CLEANUPCMD) + strlen(tmpDirPath) + 1);

+    if (!cleanupCommand) {

+       SetDeployError("Error allocating memory.");

++      free(tmpDirPath);

+       return DEPLOY_ERROR;

+    }

+ 

+    strcpy(cleanupCommand, CLEANUPCMD);

+-   strcat(cleanupCommand, CLEANUPPATH);

++   strcat(cleanupCommand, tmpDirPath);

+ 

+    sLog(log_info, "Launching cleanup. \n");

+    if (ForkExecAndWaitCommand(cleanupCommand) != 0) {

+-      sLog(log_warning, "Error while clean up. Error removing directory %s. (%s)",

+-           EXTRACTPATH, strerror (errno));

+-      //TODO: What should be done if cleanup fails ??

++      sLog(log_warning, "Error while clean up tmp directory %s: (%s)",

++           tmpDirPath, strerror (errno));

+    }

+    free (cleanupCommand);

++   free(tmpDirPath);

+ 

+    if (flags & VMWAREDEPLOYPKG_HEADER_FLAGS_SKIP_REBOOT) {

+       forceSkipReboot = true;

+@@ -1388,61 +1419,6 @@

+    return retval;

+ }

+ 

+-/**

+- * Sets up the path for exracting file. For e.g. if the file is /a/b/c/d.abc

+- * then it creates /a/b/c (skips if any of the directories along the path

+- * exists). If the the path ends in '/', then the the entire input is assumed

+- * to be a directory and is created as such.

+- *

+- * @param path  IN: Complete path of the file

+- * @return TRUE on success

+- */

+-

+-Bool

+-CreateDir(const char* path)

+-{

+-   struct stat stats;

+-   char* token;

+-   char* copy;

+-

+-   // make a copy we can modify

+-   copy = strdup(path);

+-

+-   // walk through the path (it employs in string replacement)

+-   for (token = copy + 1; *token; ++token) {

+-

+-      // find

+-      if (*token != '/') {

+-         continue;

+-      }

+-

+-      /*

+-       * cut it off here for e.g. on first iteration /a/b/c/d.abc will have

+-       * token /a, on second /a/b etc

+-       */

+-      *token = 0;

+-

+-      sLog(log_debug, "Creating directory %s", copy);

+-

+-      // ignore if the directory exists

+-      if (!((stat(copy, &stats) == 0) && S_ISDIR(stats.st_mode))) {

+-         // make directory and check error (accessible only by owner)

+-         if (mkdir(copy, 0700) == -1) {

+-            sLog(log_error, "Unable to create directory %s (%s)", copy,

+-                 strerror(errno));

+-            free(copy);

+-            return FALSE;

+-         }

+-      }

+-

+-      // restore the token

+-      *token = '/';

+-   }

+-

+-   free(copy);

+-   return TRUE;

+-}

+-

+ //......................................................................................

+ 

+ /**

@@ -1,7 +1,7 @@

 Summary:        Usermode tools for VmWare virts

 Name:           open-vm-tools

 Version:        10.1.5

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        LGPLv2+

 URL:            https://github.com/vmware/open-vm-tools

 Group:          Applications/System

@@ -13,11 +13,12 @@ Source1:        gosc-scripts-1.0.tar.gz

 %define sha1 gosc-scripts-1.0=5031dd9b3b0569a40d2ee0caaa55a1cbf782345e

 Source2:        vmtoolsd.service

 Source3:        vgauthd.service

-Patch0:         GOSC-libDeploy.patch

+Patch0:         open-vm-tools-tmp-race.patch

 Patch1:         IPv6Support.patch

 Patch2:         hostnameReCustomizationFix.patch

 Patch3:         PureIPv6-hosts.patch

 Patch4:         open-vm-tools-sysmacros.patch

+Patch5:         GOSC-libDeploy.patch

 BuildRequires:  glib-devel

 BuildRequires:  xerces-c-devel

 BuildRequires:  xml-security-c-devel

@@ -41,11 +42,12 @@ VmWare virtualization user mode tools

 %prep

 %setup -q -n %{name}-stable-%{version}/%{name}

 %setup -a 1 -n %{name}-stable-%{version}/%{name}

-%patch0 -p2

+%patch0 -p0

 %patch1 -p0

 %patch2 -p0

 %patch3 -p0

 %patch4 -p1

+%patch5 -p1

 %build

 touch ChangeLog

 autoreconf -i

@@ -103,26 +105,28 @@ fi

 %changelog

-*   Fri Mar 24 2017 Alexey Makhalov <amakhalov@vmware.com> 10.1.5-2

--   Added *-sysmacros.patch to fix build issue with glibc-2.25

-*   Fri Mar 03 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.5-1

--   Updating version to 10.1.5

-*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 10.1.0-2

--   BuildRequires Linux-PAM-devel

-*   Mon Nov 21 2016 Kumar Kaushik <kaushikk@vmware.com> 10.1.0-1

--   Updating version to 10.1.0

-*   Wed Oct 05 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-14

--   Adding proper entry to /etc/hosts for IPv6.

-*   Tue Oct 04 2016 ChangLee <changLee@vmware.com> 10.0.5-13

--   Modified %check

-*   Thu Jun 23 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-12

--   Avoiding recustomization of hostname, bug#1678537.

-*   Mon Jun 13 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-11

--   Adding IPv6 Support for VCHA in customization.

-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 10.0.5-10

--   GA - Bump release of all rpms

-*   Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 10.0.5-9

--   Edit scriptlets.

+*       Fri Apr 07 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.5-3

+-       Applying tmp race condition patch, PR #1733669

+*       Fri Mar 24 2017 Alexey Makhalov <amakhalov@vmware.com> 10.1.5-2

+-       Added *-sysmacros.patch to fix build issue with glibc-2.25

+*       Fri Mar 03 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.5-1

+-       Updating version to 10.1.5

+*       Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 10.1.0-2

+-       BuildRequires Linux-PAM-devel

+*       Mon Nov 21 2016 Kumar Kaushik <kaushikk@vmware.com> 10.1.0-1

+-       Updating version to 10.1.0

+*       Wed Oct 05 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-14

+-       Adding proper entry to /etc/hosts for IPv6.

+*       Tue Oct 04 2016 ChangLee <changLee@vmware.com> 10.0.5-13

+-       Modified %check

+*       Thu Jun 23 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-12

+-       Avoiding recustomization of hostname, bug#1678537.

+*       Mon Jun 13 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-11

+-       Adding IPv6 Support for VCHA in customization.

+*       Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 10.0.5-10

+-       GA - Bump release of all rpms

+*       Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 10.0.5-9

+-       Edit scriptlets.

 *       Fri Apr 29 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-8

 -       Combining all GOSC scripts patches and fixing bug#1648133.

 *       Tue Apr 19 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-7