Merge ~paelzer/ubuntu/+source/open-vm-tools:fix-lp1791220-lp1790145-cosmic into ubuntu/+source/open-vm-tools:ubuntu/cosmic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Two small but important changes that eventually will also be Bionic SRU material.
Hoping to fix this in cosmic before things freeze completely

Testing PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3409

[Christian Ehrhardt  (paelzer)]

FYI - this is a pre-review.
The timeout change is sort of unclear as I have positive feedback on one side, but other reports of it working fine without the change.

[Andreas Hasenack (ahasenack)]

+1 for the upstream patch. I was going to test it, but cosmic cloud images are currently broken because of https://bugs.launchpad.net/cloud-images/+bug/1791691.

Regarding the timeout change, I just now saw the bug mentioned in the changelog, and I linked this MP to it. I believe you are testing this in that vsphere/esx VM, and we can talk again tomorrow.

d178e8e... by Christian Ehrhardt  on 2018-09-11

Revert "- d/p/debian/scsi-udev-rule: update to match changes in 10.3 (DEVTYPE check added upstream)"

This reverts commit dfc6c733d96e57b5aa29b46e8ba9a6fefa3fb7b3.

[Christian Ehrhardt  (paelzer)]

Yes, thanks for that vsphere access that really helped to get this resolved.
Will have an update here in a bit.

5479f4a... by Christian Ehrhardt  on 2018-09-11

- refresh patch context to match upstream version 10.3

Signed-off-by: Christian Ehrhardt <email address hidden>

[Andreas Hasenack (ahasenack)]

Crash fix verified. It still exits code 0 when run in something other than a vmware vm, though. Like in a lxd.

Is the scsi udev change complete and ready?

[Christian Ehrhardt  (paelzer)]

>
> Is the scsi udev change complete and ready?
>
> yes

[Christian Ehrhardt  (paelzer)]

Ok, I pushed the updated version.
The timeout issue is now fixed as well.

I pushed an updated ...ubuntu3~ppa1 version to the ppa (will eventually be ubuntu2 as proposed here, I just have consumed the ubuntu2 version in the ppa already)

For testing:
- timeout 10.245.205.25 has your pubkey as well.
- segfault you can use a bionic container and partially upgrade to cosmic?

[Andreas Hasenack (ahasenack)]

- segfault fix verified
- timeout fix verified, but I had to reboot. Is there another way? I guess not, because the timeout setting happens when the device is added. Maybe unplugging and replugging the disk via the vsphere GUI, which I don't think we should try :) I was just curious.

Maybe just update the second d/changelog entry with the name of the patch that was changed?

+1 regardless, no need to re-review if you change it (or not).

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/open-vm-tools
 * [new tag] upload/2%10.3.0-0ubuntu2 -> upload/2%10.3.0-0ubuntu2

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading open-vm-tools_10.3.0-0ubuntu2.dsc: done.
  Uploading open-vm-tools_10.3.0-0ubuntu2.debian.tar.xz: done.
  Uploading open-vm-tools_10.3.0-0ubuntu2_source.buildinfo: done.
  Uploading open-vm-tools_10.3.0-0ubuntu2_source.changes: done.

diff --git a/debian/changelog b/debian/changelog
index daa14fd..bb0d66a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+open-vm-tools (2:10.3.0-0ubuntu2) cosmic; urgency=medium
+
+  * d/p/ubuntu/lp-1791220-Disable-hgfsServer-not-VMware.patch: avoid crashing
+    with segfaults when force starting the service in non VMWare environments.
+    (LP: #1791220)
+  * fix applying of the scsi timeout (LP: #1790145)
+    - revert "update to match changes in 10.3 (DEVTYPE checkadded upstream)"
+    - refresh patch context to match upstream version 10.3
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 10 Sep 2018 09:33:13 +0200
+
 open-vm-tools (2:10.3.0-0ubuntu1) cosmic; urgency=medium
 
   * Merge with Upstream Tag stable-10.3.0 (LP: #1784638) from
diff --git a/debian/patches/debian/scsi-udev-rule b/debian/patches/debian/scsi-udev-rule
index 8c5fc64..3f8a23b 100644
--- a/debian/patches/debian/scsi-udev-rule
+++ b/debian/patches/debian/scsi-udev-rule
@@ -6,6 +6,6 @@
  
 -ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
 -ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
-+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", ATTR{timeout}="180"
-+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", ATTR{timeout}="180"
++ACTION=="add", SUBSYSTEMS=="scsi", ENV{DEVTYPE}=="scsi_device", ATTRS{vendor}=="VMware*" , ATTRS{model}=="Virtual disk*", ATTRS{timeout}=="?*", ATTR{timeout}="180"
++ACTION=="add", SUBSYSTEMS=="scsi", ENV{DEVTYPE}=="scsi_device", ATTRS{vendor}=="VMware*" , ATTRS{model}=="VMware Virtual S", ATTRS{timeout}=="?*", ATTR{timeout}="180"
  
diff --git a/debian/patches/series b/debian/patches/series
index c4eabb2..7411f4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ debian/pam-use-common-auth-account
 debian/max_nic_count
 debian/enable_vmhgfs-fuse_by_default
 debian/scsi-udev-rule
+ubuntu/lp-1791220-Disable-hgfsServer-not-VMware.patch
diff --git a/debian/patches/ubuntu/lp-1791220-Disable-hgfsServer-not-VMware.patch b/debian/patches/ubuntu/lp-1791220-Disable-hgfsServer-not-VMware.patch
new file mode 100644
index 0000000..788c7b1
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1791220-Disable-hgfsServer-not-VMware.patch
@@ -0,0 +1,39 @@
+From ebf08325adf874723c86aa313954492101117934 Mon Sep 17 00:00:00 2001
+From: Oliver Kurth <[e-mail]>
+Date: Wed, 29 Aug 2018 13:29:44 -0700
+Subject: [PATCH] Disable hgfsServer plugin when not running in a VMware VM.
+
+VmCheck_GetVersion() accesses Backdoor in an unsafe manner
+which is not expected to work on non-VMware environments
+including physical machines. So, we need to make sure that
+VmCheck_GetVersion() is called only when we are running in
+a VMware VM.
+---
+Origin: backport, https://github.com/vmware/open-vm-tools/commit/ebf08325adf874723c86aa313954492101117934
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1791220
+
+Last-Update: 2018-05-19
+ open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
+index c5ef8726b..129fa7504 100644
+--- a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
++++ b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
+@@ -1089,6 +1089,13 @@ ToolsOnLoad(ToolsAppCtx *ctx)
+       return NULL;
+    }
+ 
++   /*
++    * 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.
+-- 
+2.17.1
+