diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 169b8b7d98f60e6f2be9c353b5a7f371b76323ec..5738598aa62d301f2bdf8d7d52604b5ee69f79e5 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -29,7 +29,7 @@ Name: open-vm-tools Version: %{toolsversion} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open Virtual Machine Tools for virtual machines hosted on VMware License: GPLv2 URL: https://github.com/vmware/%{name} @@ -49,6 +49,8 @@ Patch1: 2023-20867-Remove-some-dead-code.patch Patch2: CVE-2023-20900.patch Patch3: CVE-2023-34058.patch Patch4: CVE-2023-34059.patch +# For bz#2119284 - CVE-2022-31676 open-vm-tools: local root privilege escalation in the virtual machine [rhel-8.7.0] +Patch5: ovt-Properly-check-authorization-on-incoming-guestOps-re.patch BuildRequires: autoconf BuildRequires: automake @@ -390,6 +392,9 @@ fi %{_bindir}/vmware-vgauth-smoketest %changelog +* Thu Jun 27 2024 zhangxianting - 12.0.5-5 +- Fix CVE-2022-31676 + * Mon Nov 13 2023 Chenxi Mao - 12.0.5-4 - Fix CVE-2023-34058 CVE-2023-34059 diff --git a/ovt-Properly-check-authorization-on-incoming-guestOps-re.patch b/ovt-Properly-check-authorization-on-incoming-guestOps-re.patch new file mode 100644 index 0000000000000000000000000000000000000000..b4e9ae8c49d0c33e78892948fc0d1d509d0bf114 --- /dev/null +++ b/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 +