From 9afb1e9b50693e49d49cf6075da20346672992c0 Mon Sep 17 00:00:00 2001
From: Ravindra Kumar <ravindrakumar@vmware.com>
Date: Mon, 6 Aug 2018 12:07:12 -0700
Subject: [PATCH] Added hgfsPlugin-crash.patch for vmtoolsd crash
 (RHBZ#1612470).

---
 hgfsPlugin-crash.patch | 17 +++++++++++++++++
 open-vm-tools.spec     |  7 ++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 hgfsPlugin-crash.patch

diff --git a/hgfsPlugin-crash.patch b/hgfsPlugin-crash.patch
new file mode 100644
index 0000000..f819238
--- /dev/null
+++ b/hgfsPlugin-crash.patch
@@ -0,0 +1,17 @@
+diff -ru open-vm-tools-10.3.0-8931395.orig/services/plugins/hgfsServer/hgfsPlugin.c open-vm-tools-10.3.0-8931395/services/plugins/hgfsServer/hgfsPlugin.c
+--- open-vm-tools-10.3.0-8931395.orig/services/plugins/hgfsServer/hgfsPlugin.c	2018-06-23 03:03:48.000000000 -0700
++++ open-vm-tools-10.3.0-8931395/services/plugins/hgfsServer/hgfsPlugin.c	2018-08-06 11:50:03.917850541 -0700
+@@ -1090,6 +1090,13 @@
+    }
+ 
+    /*
++    * If not running in a VMware VM, return NULL to disable the plugin.
++    */
++   if (!ctx->isVMware) {
++      return NULL;
++   }
++
++   /*
+     * Check for VM is running in a hosted environment and if so initialize
+     * the Shared Folders HGFS client redirector.
+     */
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index caddc6e..df15559 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -28,7 +28,7 @@
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 Group:            Applications/System
 License:          GPLv2
@@ -43,6 +43,7 @@ ExclusiveArch:    %{ix86} x86_64
 %endif
 
 Patch1:           cloud-init.patch
+Patch2:           hgfsPlugin-crash.patch
 
 BuildRequires:    autoconf
 BuildRequires:    automake
@@ -149,6 +150,7 @@ machines.
 %prep
 %setup -q -n %{name}-%{version}-%{toolsbuild}
 %patch1 -p2
+%patch2 -p1
 
 %build
 # Required for regenerating configure script when
@@ -326,6 +328,9 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Mon Aug 06 2018 Ravindra Kumar <ravindrakumar@vmware.com> - 10.3.0-2
+- Added hgfsPlugin-crash.patch for vmtoolsd crash (RHBZ#1612470).
+
 * Thu Aug 02 2018 Ravindra Kumar <ravindrakumar@vmware.com> - 10.3.0-1
 - Package new upstream version open-vm-tools-10.3.0-8931395.
 - Updated cloud-init.patch for 10.3.0.