From 3e8eacb54f8e6c86534c7d3891ceef5cd5cedef5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 06 2022 14:27:39 +0000
Subject: import open-vm-tools-11.3.5-1.el9_0.1


---

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..450beb9
--- /dev/null
+++ b/SOURCES/ovt-Properly-check-authorization-on-incoming-guestOps-re.patch
@@ -0,0 +1,55 @@
+From 033aaf84f7d4802120aa63d3de7f126e2a790a0d Mon Sep 17 00:00:00 2001
+From: Cathy Avery <cavery@redhat.com>
+Date: Mon, 29 Aug 2022 12:50:45 -0400
+Subject: [PATCH] Properly check authorization on incoming guestOps requests.
+
+RH-Author: Cathy Avery <cavery@redhat.com>
+RH-MergeRequest: 13: Properly check authorization on incoming guestOps requests.
+RH-Bugzilla: 2119285
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Commit: [1/1] 7c92651ede82ff9431eaaf7a24889d50ad77e7e3
+
+Tested: Tested by QE
+Upstream Status: origin/master
+Conflicts: None
+
+    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 db7159ee..6c672601 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-2021 VMware, Inc. All rights reserved.
++ * Copyright (C) 2011-2016,2019-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
+@@ -1201,6 +1201,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.31.1
+
diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec
index 846d68b..8105099 100644
--- a/SPECS/open-vm-tools.spec
+++ b/SPECS/open-vm-tools.spec
@@ -32,7 +32,7 @@
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          1%{?dist}
+Release:          1%{?dist}.1
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 License:          GPLv2
 URL:              https://github.com/vmware/%{name}
@@ -51,6 +51,9 @@ ExclusiveArch:    x86_64 aarch64
 ExclusiveArch:    %{ix86} x86_64 aarch64
 %endif
 
+# For bz#2119285 - CVE-2022-31676 open-vm-tools: local root privilege escalation in the virtual machine [rhel-9.0.0.z]
+Patch1: ovt-Properly-check-authorization-on-incoming-guestOps-re.patch
+
 # Source-git patches
 
 BuildRequires:    autoconf
@@ -390,6 +393,11 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Thu Sep 01 2022 Miroslav Rezanina <mrezanin@redhat.com> - 11.3.5-1.el9_0.1
+- ovt-Properly-check-authorization-on-incoming-guestOps-re.patch [bz#2119285]
+- Resolves: bz#2119285
+  (CVE-2022-31676 open-vm-tools: local root privilege escalation in the virtual machine [rhel-9.0.0.z])
+
 * Fri Oct 15 2021 Miroslav Rezanina <mrezanin@redhat.com> - 11.3.5-1
 - Rebase to 11.3.5 [bz#2008243]
 - Resolves: bz#2008243