rpms
/
open-vm-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import open-vm-tools-11.0.5-3.el8

This commit is contained in:
CentOS Sources 2020-07-21 11:03:24 -04:00 committed by Andrew Lukoshko
parent 347254b743
commit 1d04237d14
14 changed files with 1768 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/open-vm-tools-11.0.0-14549434.tar.gz
SOURCES/open-vm-tools-11.0.5-15389592.tar.gz

2
.open-vm-tools.metadata
View File

@ -1 +1 @@
c4b7df8636a02195151a51b46d1af2690cca7e78 SOURCES/open-vm-tools-11.0.0-14549434.tar.gz
502484f4a112954932a7ee32d234e0c85793fcac SOURCES/open-vm-tools-11.0.5-15389592.tar.gz

4
SOURCES/ovt-Address-Coverity-issues-reported-in-bora-lib-file-fi.patch → SOURCES/0002-Address-Coverity-issues-reported-in-bora-lib-file-fi.patch
View File

@ -1,7 +1,7 @@
From d01520e206cc1e3ae658e8fb168ff3b4494fc1ef Mon Sep 17 00:00:00 2001
From e1d523d4fdb179e3fd2494d18e813a4e392006e5 Mon Sep 17 00:00:00 2001
From: Cathy Avery <cavery@redhat.com>
Date: Tue, 3 Dec 2019 14:30:47 +0100
Subject: [PATCH 1/4] Address Coverity issues reported in bora/lib/file/file.c.
Subject: Address Coverity issues reported in bora/lib/file/file.c.
RH-Author: Cathy Avery <cavery@redhat.com>
Message-id: <20191203143050.23065-2-cavery@redhat.com>

69
SOURCES/0002-Fix-leaks-in-ListAliases-and-ListMappedAliases.patch
View File

@ -1,69 +0,0 @@
From 1128cfce9031891ff0da50131b75771582756ca1 Mon Sep 17 00:00:00 2001
From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 2 Oct 2019 17:48:35 -0700
Subject: Fix leaks in ListAliases and ListMappedAliases.
The 'record' for each alias was being leaked.
---
open-vm-tools/services/plugins/vix/vixTools.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
index 44bca5c..c40ad15 100644
--- a/open-vm-tools/services/plugins/vix/vixTools.c
+++ b/open-vm-tools/services/plugins/vix/vixTools.c
@@ -9762,7 +9762,6 @@ VixToolsListAuthAliases(VixCommandRequestHeader *requestMsg, // IN
char *destPtr;
char *endDestPtr;
char *tmpBuf = NULL;
- char *recordBuf;
size_t recordSize;
char *escapedStr = NULL;
char *escapedStr2 = NULL;
@@ -9822,6 +9821,8 @@ VixToolsListAuthAliases(VixCommandRequestHeader *requestMsg, // IN
destPtr += Str_Sprintf(destPtr, endDestPtr - destPtr, "%s",
VIX_XML_ESCAPED_TAG);
for (i = 0; i < num; i++) {
+ char *recordBuf = NULL;
+
escapedStr = VixToolsEscapeXMLString(uaList[i].pemCert);
if (escapedStr == NULL) {
err = VIX_E_OUT_OF_MEMORY;
@@ -9895,6 +9896,8 @@ VixToolsListAuthAliases(VixCommandRequestHeader *requestMsg, // IN
Log("%s: ListAuth list results too large, truncating", __FUNCTION__);
goto abort;
}
+ free(recordBuf);
+ recordBuf = NULL;
}
*result = resultBuffer;
@@ -9960,7 +9963,6 @@ VixToolsListMappedAliases(VixCommandRequestHeader *requestMsg, // IN
char *destPtr;
char *endDestPtr;
char *tmpBuf = NULL;
- char *recordBuf;
char *escapedStr = NULL;
char *escapedStr2 = NULL;
size_t recordSize;
@@ -10014,6 +10016,8 @@ VixToolsListMappedAliases(VixCommandRequestHeader *requestMsg, // IN
destPtr += Str_Sprintf(destPtr, endDestPtr - destPtr, "%s",
VIX_XML_ESCAPED_TAG);
for (i = 0; i < num; i++) {
+ char *recordBuf = NULL;
+
escapedStr = VixToolsEscapeXMLString(maList[i].pemCert);
if (escapedStr == NULL) {
err = VIX_E_OUT_OF_MEMORY;
@@ -10085,6 +10089,8 @@ VixToolsListMappedAliases(VixCommandRequestHeader *requestMsg, // IN
Log("%s: ListMapped results too large, truncating", __FUNCTION__);
goto abort;
}
+ free(recordBuf);
+ recordBuf = NULL;
}
*result = resultBuffer;
--
1.8.3.1

5
SOURCES/ovt-Fix-a-potential-NULL-pointer-dereference-in-the-vmba.patch → SOURCES/0003-Fix-a-potential-NULL-pointer-dereference-in-the-vmba.patch
View File

@ -1,8 +1,7 @@
From 6c6daa468c9a1ad1ad4d5bf727008d029d009a50 Mon Sep 17 00:00:00 2001
From 9beab82cd41a79babaeef46129a88b9a8d7e120f Mon Sep 17 00:00:00 2001
From: Cathy Avery <cavery@redhat.com>
Date: Tue, 3 Dec 2019 14:30:48 +0100
Subject: [PATCH 2/4] Fix a potential NULL pointer dereference in the vmbackup
plugin.
Subject: Fix a potential NULL pointer dereference in the vmbackup plugin.
RH-Author: Cathy Avery <cavery@redhat.com>
Message-id: <20191203143050.23065-3-cavery@redhat.com>

10
SOURCES/ovt-Address-two-Coverity-reported-issues-in-hostinfoPosi.patch → SOURCES/0004-Address-two-Coverity-reported-issues-in-hostinfoPosi.patch
View File

@ -1,7 +1,7 @@
From 805d013a5604b124177149be4d10384f58eff74b Mon Sep 17 00:00:00 2001
From 8fbef69f0b3ce6648d594794b945169331ddfa06 Mon Sep 17 00:00:00 2001
From: Cathy Avery <cavery@redhat.com>
Date: Tue, 3 Dec 2019 14:30:49 +0100
Subject: [PATCH 3/4] Address two Coverity-reported issues in hostinfoPosix.c.
Subject: Address two Coverity-reported issues in hostinfoPosix.c.
RH-Author: Cathy Avery <cavery@redhat.com>
Message-id: <20191203143050.23065-4-cavery@redhat.com>
@ -29,10 +29,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 348a67e..302452e 100644
index 9d58abe..20cefb5 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -1127,10 +1127,7 @@ out:
@@ -1153,10 +1153,7 @@ out:
if (success) {
result[nArgs - 1] = DynBuf_Detach(&b);
} else {
@ -44,7 +44,7 @@ index 348a67e..302452e 100644
result = NULL;
}
@@ -2884,7 +2881,10 @@ Hostinfo_Daemonize(const char *path, // IN: NUL-terminated UTF-8
@@ -2916,7 +2913,10 @@ Hostinfo_Daemonize(const char *path, // IN: NUL-terminated UTF-8
* with another process attempting to daemonize and unlinking the
* file it created instead.
*/

4
SOURCES/ovt-Fix-a-resource-leak-issue-in-deployPkg.patch → SOURCES/0005-Fix-a-resource-leak-issue-in-deployPkg.patch
View File

@ -1,7 +1,7 @@
From acf9aa0dce71106f3603398a7b6984ff91dd0eda Mon Sep 17 00:00:00 2001
From 9357c2476eb74a9862ec07d0ede8d933b734e5cc Mon Sep 17 00:00:00 2001
From: Cathy Avery <cavery@redhat.com>
Date: Tue, 3 Dec 2019 14:30:50 +0100
Subject: [PATCH 4/4] Fix a resource leak issue in deployPkg
Subject: Fix a resource leak issue in deployPkg
RH-Author: Cathy Avery <cavery@redhat.com>
Message-id: <20191203143050.23065-5-cavery@redhat.com>

8
SOURCES/ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch → SOURCES/0006-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch
View File

@ -1,7 +1,7 @@
From 6536375aa0f30fe9226ec687d7854d5c2aef5a7d Mon Sep 17 00:00:00 2001
From 036b206fac64786447e841c7b57941ecbdf84e77 Mon Sep 17 00:00:00 2001
From: Cathy Avery <cavery@redhat.com>
Date: Fri, 14 Feb 2020 12:23:09 +0100
Subject: [PATCH] Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log )
Subject: Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log )
RH-Author: Cathy Avery <cavery@redhat.com>
Message-id: <20200214122309.5769-1-cavery@redhat.com>
@ -39,10 +39,10 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/open-vm-tools/services/plugins/guestInfo/diskInfo.c b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
index a8234a4..c974dbd 100644
index 878276c..032c092 100644
--- a/open-vm-tools/services/plugins/guestInfo/diskInfo.c
+++ b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
@@ -837,9 +837,9 @@ GuestInfoGetDiskDevice(const char *fsName,
@@ -846,9 +846,9 @@ GuestInfoGetDiskDevice(const char *fsName,
*/
for (indx = 0; indx < partEntry->diskDevCnt; indx++) {
if (partEntry->diskDevNames[indx][0] == '\0') {

1
SOURCES/open-vm-tools.conf Normal file
View File

@ -0,0 +1 @@
fuse

43
SOURCES/ovt-Fix-a-trivial-memory-leak-in-namespacetool.c.patch Normal file
View File

@ -0,0 +1,43 @@
From 8914b79dadae708672657e8879832d61c4f2cde1 Mon Sep 17 00:00:00 2001
From: Cathy Avery <cavery@redhat.com>
Date: Tue, 21 Apr 2020 10:38:45 +0200
Subject: [PATCH 1/3] Fix a trivial memory leak in namespacetool.c.
RH-Author: Cathy Avery <cavery@redhat.com>
Message-id: <20200331185439.5940-2-cavery@redhat.com>
Patchwork-id: 94516
O-Subject: [RHEL-8.2.1 open-vm-tools PATCH 1/2] Fix a trivial memory leak in namespacetool.c.
Bugzilla: 1811729
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
commit 8dbd6e991315bb1b0a18c369c4d2bb165ef1f184
Author: Oliver Kurth <okurth@vmware.com>
Date: Tue, 17 Mar 2020 14:36:55 -0700
Fix a trivial memory leak in namespacetool.c.
Fix a memory leak reported by a customer based on their Coverity
scans of open-vm-tools.
Signed-off-by: Cathy Avery <cavery@redhat.com>
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
open-vm-tools/namespacetool/namespacetool.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/open-vm-tools/namespacetool/namespacetool.c b/open-vm-tools/namespacetool/namespacetool.c
index 171e352..bfd003d 100644
--- a/open-vm-tools/namespacetool/namespacetool.c
+++ b/open-vm-tools/namespacetool/namespacetool.c
@@ -233,6 +233,7 @@ GetValueFromStdin(gchar **data, gsize *length)
*length = 0;
}
g_free(gErr);
+ g_io_channel_unref(iochannel);
return retVal;
}
--
1.8.3.1

39
SOURCES/ovt-Update-copyright-to-reflect-previous-change.patch Normal file
View File

@ -0,0 +1,39 @@
From dd9e505722eeb8e2e5e8db6ab903b2bd9480a224 Mon Sep 17 00:00:00 2001
From: Cathy Avery <cavery@redhat.com>
Date: Tue, 21 Apr 2020 10:38:48 +0200
Subject: [PATCH 2/3] Update copyright to reflect previous change.
RH-Author: Cathy Avery <cavery@redhat.com>
Message-id: <20200331185439.5940-3-cavery@redhat.com>
Patchwork-id: 94517
O-Subject: [RHEL-8.2.1 open-vm-tools PATCH 2/2] Update copyright to reflect previous change.
Bugzilla: 1811729
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
commit 95bb9273cccfd38e0f3299828a0a6cf5a8c30efb
Author: Oliver Kurth <okurth@vmware.com>
Date: Tue, 17 Mar 2020 14:36:55 -0700
Update copyright to reflect previous change.
Signed-off-by: Cathy Avery <cavery@redhat.com>
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
open-vm-tools/namespacetool/namespacetool.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/open-vm-tools/namespacetool/namespacetool.c b/open-vm-tools/namespacetool/namespacetool.c
index bfd003d..fc38f06 100644
--- a/open-vm-tools/namespacetool/namespacetool.c
+++ b/open-vm-tools/namespacetool/namespacetool.c
@@ -1,5 +1,5 @@
/*********************************************************
- * Copyright (C) 2016-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2016-2020 VMware, Inc. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published
--
1.8.3.1

1608
SOURCES/ovt-add-appinfo-plugin.patch Normal file
View File

File diff suppressed because it is too large Load Diff

17
SOURCES/run-vmblock\x2dfuse.mount Normal file
View File

@ -0,0 +1,17 @@
[Unit]
Description=VMware vmblock Fuse Mount
Documentation=https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/vmblock-fuse/design.txt
DefaultDependencies=no
Before=umount.target vmtoolsd.service
ConditionVirtualization=vmware
After=sys-fs-fuse-connections.mount
Wants=vmtoolsd.service
[Mount]
What=vmware-vmblock-fuse
Where=/run/vmblock-fuse
Type=fuse
Options=subtype=vmware-vmblock,default_permissions,allow_other
[Install]
WantedBy=multi-user.target

62
SPECS/open-vm-tools.spec
View File

@ -20,15 +20,15 @@
%global _hardened_build 1
%global majorversion 11.0
%global minorversion 0
%global toolsbuild 14549434
%global minorversion 5
%global toolsbuild 15389592
%global toolsversion %{majorversion}.%{minorversion}
%global toolsdaemon vmtoolsd
%global vgauthdaemon vgauthd
Name: open-vm-tools
Version: %{toolsversion}
Release: 4%{?dist}
Release: 3%{?dist}
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
Group: Applications/System
License: GPLv2
@ -36,19 +36,22 @@ URL: https://github.com/vmware/%{name}
Source0: https://github.com/vmware/%{name}/releases/download/stable-%{version}/%{name}-%{version}-%{toolsbuild}.tar.gz
Source1: %{toolsdaemon}.service
Source2: %{vgauthdaemon}.service
Source3: run-vmblock\x2dfuse.mount
Source4: open-vm-tools.conf
ExclusiveArch: x86_64
Patch0002: 0002-Fix-leaks-in-ListAliases-and-ListMappedAliases.patch
# For bz#1769881 - [ESXi][RHEL8.2]Important issues found by covscan in "open-vm-tools-11.0.0-2.el8" package
Patch3: ovt-Address-Coverity-issues-reported-in-bora-lib-file-fi.patch
# For bz#1769881 - [ESXi][RHEL8.2]Important issues found by covscan in "open-vm-tools-11.0.0-2.el8" package
Patch4: ovt-Fix-a-potential-NULL-pointer-dereference-in-the-vmba.patch
# For bz#1769881 - [ESXi][RHEL8.2]Important issues found by covscan in "open-vm-tools-11.0.0-2.el8" package
Patch5: ovt-Address-two-Coverity-reported-issues-in-hostinfoPosi.patch
# For bz#1769881 - [ESXi][RHEL8.2]Important issues found by covscan in "open-vm-tools-11.0.0-2.el8" package
Patch6: ovt-Fix-a-resource-leak-issue-in-deployPkg.patch
# For bz#1800812 - [ESXi][RHEL8]Log spew "[ warning] [guestinfo] GuestInfoGetDiskDevice: Missing disk device name
Patch7: ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch
Patch0002: 0002-Address-Coverity-issues-reported-in-bora-lib-file-fi.patch
Patch0003: 0003-Fix-a-potential-NULL-pointer-dereference-in-the-vmba.patch
Patch0004: 0004-Address-two-Coverity-reported-issues-in-hostinfoPosi.patch
Patch0005: 0005-Fix-a-resource-leak-issue-in-deployPkg.patch
Patch0006: 0006-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch
# For bz#1811729 - [ESXi][RHEL8.2.1]open-vm-tools coverity scan issue
Patch7: ovt-Fix-a-trivial-memory-leak-in-namespacetool.c.patch
# For bz#1811729 - [ESXi][RHEL8.2.1]open-vm-tools coverity scan issue
Patch8: ovt-Update-copyright-to-reflect-previous-change.patch
# For bz#1809751 - [ESXi][RHEL8.2.1]open-vm-tools add appinfo plugin patch
Patch9: ovt-add-appinfo-plugin.patch
BuildRequires: autoconf
BuildRequires: automake
@ -190,6 +193,9 @@ mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir}
# Systemd unit files
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_unitdir}/%{toolsdaemon}.service
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_unitdir}/%{vgauthdaemon}.service
install -p -m 644 -D '%{SOURCE3}' %{buildroot}%{_unitdir}/run-vmblock\\x2dfuse.mount
install -p -m 644 -D %{SOURCE4} %{buildroot}/usr/lib/modules-load.d/open-vm-tools.conf
# 'make check' in open-vm-tools rebuilds docs and ends up regenerating
# the font file. We can add %%check secion once 'make check' is fixed
@ -221,11 +227,12 @@ if [ "$1" = "2" ]; then
# Cleanup vmtoolsd-init.service in case of upgrades
%{_bindir}/systemctl disable %{toolsdaemon}-init.service &> /dev/null || /bin/true
fi
%systemd_post %{vgauthdaemon}.service
%systemd_post %{toolsdaemon}.service
%post desktop
%systemd_post run-vmblock\x2dfuse.mount
%preun
%systemd_preun %{toolsdaemon}.service
%systemd_preun %{vgauthdaemon}.service
@ -248,6 +255,9 @@ if [ "$1" = "0" -a \
fi
fi
%preun desktop
%systemd_preun run-vmblock\x2dfuse.mount
%postun
%{?ldconfig}
%systemd_postun_with_restart %{toolsdaemon}.service
@ -294,6 +304,9 @@ fi
%{_udevrulesdir}/99-vmware-scsi-udev.rules
%{_unitdir}/%{toolsdaemon}.service
%{_unitdir}/%{vgauthdaemon}.service
%{_unitdir}/run-vmblock\x2dfuse.mount
/usr/lib/modules-load.d/open-vm-tools.conf
%files desktop
%{_sysconfdir}/xdg/autostart/*.desktop
@ -317,6 +330,20 @@ fi
%{_bindir}/vmware-vgauth-smoketest
%changelog
* Tue Apr 21 2020 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.5-3.el8
- ovt-Fix-a-trivial-memory-leak-in-namespacetool.c.patch [bz#1811729]
- ovt-Update-copyright-to-reflect-previous-change.patch [bz#1811729]
- ovt-add-appinfo-plugin.patch [bz#1809751]
- Resolves: bz#1809751
([ESXi][RHEL8.2.1]open-vm-tools add appinfo plugin patch)
- Resolves: bz#1811729
([ESXi][RHEL8.2.1]open-vm-tools coverity scan issue)
* Wed Apr 08 2020 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.5-1.el8
- Rebase to 11.0.5 (bz#1798285)
- Resolves: bz#1798285
([ESXi][RHEL8.2.1]Rebase open-vm-tools to 11.0.5 for 8.2.1)
* Tue Feb 18 2020 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.0-4.el8
- ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch [bz#1800812]
- Resolves: bz#1800812
@ -330,9 +357,6 @@ fi
- Resolves: bz#1769881
([ESXi][RHEL8.2]Important issues found by covscan in "open-vm-tools-11.0.0-2.el8" package)
* Tue Oct 15 2019 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.0-2.el8
- Add missing gating tests
* Mon Oct 14 2019 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.0-1.el8
- Rebase to 11.0.0 [bz#1754658]
- Resolves: bz#1754658