Merge ~paelzer/ubuntu/+source/open-vm-tools:lp-1793219-stats-overflow-cosmic into ubuntu/+source/open-vm-tools:ubuntu/cosmic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

The patch from upstream applies as-is and makes sense in general.
Test build in PPA [1]

Later on we will need more info on how to reproduce for the SRU, but for cosmic this should be fine right now.

[1]: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3434/+packages

[Christian Ehrhardt  (paelzer)]

Thanks Rbasak for the review.

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

[Christian Ehrhardt  (paelzer)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading open-vm-tools_10.3.0-0ubuntu3.dsc: done.
  Uploading open-vm-tools_10.3.0-0ubuntu3.debian.tar.xz: done.
  Uploading open-vm-tools_10.3.0-0ubuntu3_source.buildinfo: done.
  Uploading open-vm-tools_10.3.0-0ubuntu3_source.changes: done.
Successfully uploaded packages.

Due to the beta freeze this is now in https://launchpad.net/ubuntu/cosmic/+queue?queue_state=1 to be approved.

diff --git a/debian/changelog b/debian/changelog
index 1147ffe..c6267c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+open-vm-tools (2:10.3.0-0ubuntu3) cosmic; urgency=medium
+
+  * d/p/lp-1793219-fix-stats-overflow.patch: fix potential overflow of 32 bit
+    /proc values (LP: #1793219)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 24 Sep 2018 11:21:11 +0200
+
 open-vm-tools (2:10.3.0-0ubuntu2) cosmic; urgency=medium
 
   * d/p/ubuntu/lp-1791220-Disable-hgfsServer-not-VMware.patch: avoid crashing
diff --git a/debian/patches/lp-1793219-fix-stats-overflow.patch b/debian/patches/lp-1793219-fix-stats-overflow.patch
new file mode 100644
index 0000000..8c0e94d
--- /dev/null
+++ b/debian/patches/lp-1793219-fix-stats-overflow.patch
@@ -0,0 +1,46 @@
+From c7a186e204cdff46b5e02bcb5208ef8979eaf261 Mon Sep 17 00:00:00 2001
+From: Oliver Kurth <[e-mail]>
+Date: Mon, 17 Sep 2018 16:41:18 -0700
+Subject: [PATCH] Handle Linux kernel /proc FS uint32 type stat overflow when
+ calculating tools rate stats.
+
+On both 32-bit and 64-bit Linux, tools always parses Linux kernel /proc
+FS stats as uint64 values.  For rate stats, current - previous can handle
+uint64 type stat overflow, but not uint32 type.
+
+Origin: upstream, https://github.com/vmware/open-vm-tools/commit/c7a186e204cdff46b5e02bcb5208ef8979eaf261
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1793219
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909146
+Last-Update: 2018-09-24
+
+---
+ .../services/plugins/guestInfo/perfMonLinux.c       | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/open-vm-tools/services/plugins/guestInfo/perfMonLinux.c b/open-vm-tools/services/plugins/guestInfo/perfMonLinux.c
+index fa2344b0f..eb74faa55 100644
+--- a/open-vm-tools/services/plugins/guestInfo/perfMonLinux.c
++++ b/open-vm-tools/services/plugins/guestInfo/perfMonLinux.c
+@@ -1094,7 +1094,18 @@ GuestInfoAppendRate(Bool emitNameSpace,             // IN:
+       if (reportID == GuestStatID_Linux_DiskRequestQueueAvg) {
+          valueDelta = ((double)(currentStat->value)) / 10;
+       } else {
+-         valueDelta = currentStat->value - previousStat->value;
++         /*
++          * The /proc FS stat can be uint32 type in the kernel on both x86
++          * and x64 Linux, it is parsed and stored as uint64 in tools, so we
++          * also need to handle uint32 overflow here.
++          */
++         if (currentStat->value < previousStat->value &&
++             previousStat->value <= MAX_UINT32) {
++            valueDelta = (uint32)(currentStat->value) -
++                         (uint32)(previousStat->value);
++         } else {
++            valueDelta = currentStat->value - previousStat->value;
++         }
+       }
+ 
+       valueDouble = valueDelta / timeDelta;
+-- 
+2.17.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 7411f4f..12cba39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ debian/max_nic_count
 debian/enable_vmhgfs-fuse_by_default
 debian/scsi-udev-rule
 ubuntu/lp-1791220-Disable-hgfsServer-not-VMware.patch
+lp-1793219-fix-stats-overflow.patch