From 374605aef6dcef6ef8a5ed5e0454944b258b0406 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 07 2022 12:41:54 +0000
Subject: import open-vm-tools-11.0.5-3.el7_9.4


---

diff --git a/SOURCES/ovt-Properly-check-authorization-on-incoming-guestOps-re.patch b/SOURCES/ovt-Properly-check-authorization-on-incoming-guestOps-re.patch
new file mode 100644
index 0000000..4794956
--- /dev/null
+++ b/SOURCES/ovt-Properly-check-authorization-on-incoming-guestOps-re.patch
@@ -0,0 +1,57 @@
+From 1c179e67d0366ed400611f47ad2d0b9db3d0513d Mon Sep 17 00:00:00 2001
+From: Cathy Avery <cavery@redhat.com>
+Date: Mon, 29 Aug 2022 15:34:45 -0400
+Subject: [PATCH] Properly check authorization on incoming guestOps requests.
+
+RH-Author: Cathy Avery <cavery@redhat.com>
+RH-MergeRequest: 7: Properly check authorization on incoming guestOps requests.
+RH-Bugzilla: 2119310
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Commit: [1/1] 06b962ec503a1a646e21745b130a8db6981cd19f
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2119310
+Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=47449116
+Tested: Tested by QE
+Upstream Status: origin/master
+Conflicts: Copyright date
+
+    commit 70a74758bfe0042c27f15ce590fb21a2bc54d745
+    Author: John Wolfe <jwolfe@vmware.com>
+    Date:   Sun Aug 21 07:56:49 2022 -0700
+
+    Properly check authorization on incoming guestOps requests.
+
+    Fix public pipe request checks.  Only a SessionRequest type should
+    be accepted on the public pipe.
+
+Signed-off-by: Cathy Avery <cavery@redhat.com>
+---
+ open-vm-tools/vgauth/serviceImpl/proto.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/open-vm-tools/vgauth/serviceImpl/proto.c b/open-vm-tools/vgauth/serviceImpl/proto.c
+index f097fb65..b45da620 100644
+--- a/open-vm-tools/vgauth/serviceImpl/proto.c
++++ b/open-vm-tools/vgauth/serviceImpl/proto.c
+@@ -1,5 +1,5 @@
+ /*********************************************************
+- * Copyright (C) 2011-2016,2019 VMware, Inc. All rights reserved.
++ * Copyright (C) 2011-2016,2022 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
+@@ -1202,6 +1202,10 @@ Proto_SecurityCheckRequest(ServiceConnection *conn,
+    VGAuthError err;
+    gboolean isSecure = ServiceNetworkIsConnectionPrivateSuperUser(conn);
+ 
++   if (conn->isPublic && req->reqType != PROTO_REQUEST_SESSION_REQ) {
++      return VGAUTH_E_PERMISSION_DENIED;
++   }
++
+    switch (req->reqType) {
+       /*
+        * This comes over the public connection; alwsys let it through.
+-- 
+2.35.3
+
diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec
index abcb095..019c130 100644
--- a/SPECS/open-vm-tools.spec
+++ b/SPECS/open-vm-tools.spec
@@ -28,7 +28,7 @@
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          3%{?dist}.3
+Release:          3%{?dist}.4
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 Group:            Applications/System
 License:          GPLv2
@@ -40,7 +40,7 @@ Source3:          run-vmblock\x2dfuse.mount
 Source4:          open-vm-tools.conf
 Source5:          vmtoolsd.pam
 
-ExclusiveArch:    x86_64 %{ix86}
+ExclusiveArch:    x86_64
 
 Patch0002: 0002-Fix-RELRO-flag.patch
 # For bz#1809753 - [ESXi][RHEL7.9]open-vm-tools add appinfo plugin patch
@@ -53,6 +53,8 @@ Patch5: ovt-Update-copyright-to-reflect-previous-change.patch
 Patch6: ovt-Rectify-a-log-spew-in-vmsvc-logging-vmware-vmsvc-roo.patch
 # For bz#1937420 - [ESXi][RHEL7.9] Memory leak in vmtoolsd when disable-query-diskinfo is set to false [rhel-7.9.z]
 Patch7: ovt-Fix-memory-leaks-in-guestInfo-diskInfo.c.patch
+# For bz#2119310 - CVE-2022-31676 open-vm-tools: local root privilege escalation in the virtual machine [rhel-7.9.z]
+Patch8: ovt-Properly-check-authorization-on-incoming-guestOps-re.patch
 
 BuildRequires:    autoconf
 BuildRequires:    automake
@@ -333,6 +335,11 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Fri Sep 02 2022 Jon Maloy <jmaloy@redhat.com> - 11.0.5-3.el7_9.4
+- ovt-Properly-check-authorization-on-incoming-guestOps-re.patch [bz#2119310]
+- Resolves: bz#2119310
+  (CVE-2022-31676 open-vm-tools: local root privilege escalation in the virtual machine [rhel-7.9.z])
+
 * Tue Apr 06 2021 Miroslav Rezanina <mrezanin@redhat.com> - 11.0.5-3.el7_9.3
 - ovt-Fix-memory-leaks-in-guestInfo-diskInfo.c.patch [bz#1937420]
 - Resolves: bz#1937420