From 37d7984f0cab85b63a3819c056c10479b1f9b78a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 8 Sep 2022 10:19:44 +0000 Subject: [PATCH] import open-vm-tools-12.0.5-2.el8 --- ...uthorization-on-incoming-guestOps-re.patch | 57 +++++++++++++++++++ SPECS/open-vm-tools.spec | 9 ++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 SOURCES/ovt-Properly-check-authorization-on-incoming-guestOps-re.patch 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..b4e9ae8 --- /dev/null +++ b/SOURCES/ovt-Properly-check-authorization-on-incoming-guestOps-re.patch @@ -0,0 +1,57 @@ +From c8e1e5c668ead319b7a91a3a3d7decb114c5daef Mon Sep 17 00:00:00 2001 +From: Cathy Avery +Date: Mon, 29 Aug 2022 12:50:45 -0400 +Subject: [PATCH] Properly check authorization on incoming guestOps requests. + +RH-Author: Cathy Avery +RH-MergeRequest: 12: Properly check authorization on incoming guestOps requests. +RH-Bugzilla: 2119284 +RH-Acked-by: Mohamed Gamal Morsy +RH-Acked-by: Miroslav Rezanina +RH-Acked-by: Vitaly Kuznetsov +RH-Commit: [1/1] d2f10cdcba9d606492f371790c3a0be5b8ce965c +Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2119284 +Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=47492094 +Tested: Tested by QE +Upstream Status: origin/master +Conflicts: None + + commit 70a74758bfe0042c27f15ce590fb21a2bc54d745 + Author: John Wolfe + 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 +--- + 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.35.3 + diff --git a/SPECS/open-vm-tools.spec b/SPECS/open-vm-tools.spec index 57dfade..21aa3ad 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: 2%{?dist} Summary: Open Virtual Machine Tools for virtual machines hosted on VMware License: GPLv2 URL: https://github.com/vmware/%{name} @@ -44,6 +44,8 @@ Source3: run-vmblock\x2dfuse.mount Source4: open-vm-tools.conf Source5: vmtoolsd.pam +# For bz#2119284 - CVE-2022-31676 open-vm-tools: local root privilege escalation in the virtual machine [rhel-8.7.0] +Patch1: ovt-Properly-check-authorization-on-incoming-guestOps-re.patch %if 0%{?rhel} >= 7 ExclusiveArch: x86_64 @@ -409,6 +411,11 @@ fi %{_bindir}/vmware-vgauth-smoketest %changelog +* Tue Sep 06 2022 Jon Maloy - 12.0.5-2 +- ovt-Properly-check-authorization-on-incoming-guestOps-re.patch [bz#2119284] +- Resolves: bz#2119284 + (CVE-2022-31676 open-vm-tools: local root privilege escalation in the virtual machine [rhel-8.7.0]) + * Tue Jun 07 2022 Miroslav Rezanina - 12.0.5-1 - Rebase to open-vm-tools 12.0.5 [bz#2090273] - Resolves: bz#2090273