Merge ~paelzer/ubuntu/+source/open-vm-tools:lp-1855686-crash-broken-lsb-output-EOAN into ubuntu/+source/open-vm-tools:ubuntu/eoan-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Change is all the same, so for discussion I guess we can focus on https://code.launchpad.net/~paelzer/ubuntu/+source/open-vm-tools/+git/open-vm-tools/+merge/376511 and then handle all the same if agreed.

[Rafael David Tinoco (rafaeldtinoco)]

Review checklist:

- [√] changelog entry correct, targeted to correct codename "eoan"
- [-] no major upstream changes to consider
- [-] debian changes look safe
- [-] update-maintainer has been run
- [-] changes forwarded upstream/debian (if appropriate)
- [-] nothing else to drop
- [x] patches match what was proposed upstream
      - lots of weird whitespaces (upstream) have been removed.
      - code changes are the same.
- [√] patches correctly included in debian/patches/series?
- [√] patches have correct DEP3 metadata
- [√] verified PPA package installs/uninstalls
- [-] autopkgtest against the PPA package passes

+1 for this change:

open-vm-tools (2:11.0.1-2ubuntu0.19.10.2) eoan; urgency=medium

  * d/p/lp-1855686-Avoid-vmtoolsd-crash-in-HostInfo.patch: fix crash with
    uncommon lsb_output behavior (LP: #1855686)

 -- Christian Ehrhardt <email address hidden> Mon, 09 Dec 2019 11:03:56 +0100

review: Approve

[Christian Ehrhardt  (paelzer)]

Tag pushed and uploaded to -unapproved

[Christian Ehrhardt  (paelzer)]

Migrated, setting merged

diff --git a/debian/changelog b/debian/changelog
index fd2c92c..68d8b1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+open-vm-tools (2:11.0.1-2ubuntu0.19.10.2) eoan; urgency=medium
+
+  * d/p/lp-1855686-Avoid-vmtoolsd-crash-in-HostInfo.patch: fix crash with
+    uncommon lsb_output behavior (LP: #1855686)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 09 Dec 2019 11:03:56 +0100
+
 open-vm-tools (2:11.0.1-2ubuntu0.19.10.1) eoan; urgency=medium
 
   * Update to latest release v11 (LP: #1844834)
diff --git a/debian/patches/lp-1855686-Avoid-vmtoolsd-crash-in-HostInfo.patch b/debian/patches/lp-1855686-Avoid-vmtoolsd-crash-in-HostInfo.patch
new file mode 100644
index 0000000..6ed1acf
--- /dev/null
+++ b/debian/patches/lp-1855686-Avoid-vmtoolsd-crash-in-HostInfo.patch
@@ -0,0 +1,62 @@
+From 61b43df047e0a6666590016966b9574af21951a8 Mon Sep 17 00:00:00 2001
+From: Oliver Kurth <[e-mail]>
+Date: Thu, 5 Dec 2019 11:34:43 -0800
+Subject: [PATCH] Avoid vmtoolsd crash in HostInfo.
+
+The guest identification code causes vmtoolsd to crash in certain
+versions of some distros.  The crash is caused by recent changes to
+the lsb_release command.  Previously, if the command existed, all
+of its options worked.  Now, some of the options no longer exist.
+
+Change the code to check for an lsb_release failure whenever it is
+invoked.
+
+Fix for: https://github.com/vmware/open-vm-tools/issues/390
+
+Origin: upstream, https://github.com/vmware/open-vm-tools/commit/61b43df047e0a6666590016966b9574af21951a8
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1855686
+Last-Update: 2019-12-09
+Note: removed non important whitespace damage from the upstream patch
+
+---
+ open-vm-tools/lib/misc/hostinfoPosix.c | 32 +++++++++++++++-----------
+ 1 file changed, 19 insertions(+), 13 deletions(-)
+
+diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
+index 91a44ca89..26c3efd89 100644
+--- a/open-vm-tools/lib/misc/hostinfoPosix.c
++++ b/open-vm-tools/lib/misc/hostinfoPosix.c
+@@ -1334,6 +1334,8 @@ HostinfoLsbRemoveQuotes(char *lsbOutput)  // IN/OUT:
+ {
+    char *lsbStart = lsbOutput;
+ 
++   ASSERT(lsbStart != NULL);
++
+    if (lsbStart[0] == '"') {
+       char *quoteEnd = strchr(++lsbStart, '"');
+ 
+@@ -1407,13 +1409,17 @@ HostinfoLsb(char ***args)  // OUT:
+ 
+       /* LSB Distributor */
+       lsbOutput = HostinfoGetCmdOutput("/usr/bin/lsb_release -si 2>/dev/null");
+-      (*args)[0] = Util_SafeStrdup(HostinfoLsbRemoveQuotes(lsbOutput));
+-      free(lsbOutput);
++      if (lsbOutput != NULL) {
++         (*args)[0] = Util_SafeStrdup(HostinfoLsbRemoveQuotes(lsbOutput));
++         free(lsbOutput);
++      }
+ 
+       /* LSB Release */
+       lsbOutput = HostinfoGetCmdOutput("/usr/bin/lsb_release -sr 2>/dev/null");
+-      (*args)[1] = Util_SafeStrdup(HostinfoLsbRemoveQuotes(lsbOutput));
+-      free(lsbOutput);
++      if (lsbOutput != NULL) {
++         (*args)[1] = Util_SafeStrdup(HostinfoLsbRemoveQuotes(lsbOutput));
++         free(lsbOutput);
++      }
+ 
+       /* LSB Description */
+       (*args)[3] = Util_SafeStrdup((*args)[fields]);
+-- 
+2.24.0
+
diff --git a/debian/patches/series b/debian/patches/series
index daf5404..b3b4c2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ debian/max_nic_count
 debian/scsi-udev-rule
 89c0d4445_GitHub-Issue-367.-Remove-references-to-deprecated-G_INLINE_FUNC
 fix_zfs_fs_detection
+lp-1855686-Avoid-vmtoolsd-crash-in-HostInfo.patch