1From 70a74758bfe0042c27f15ce590fb21a2bc54d745 Mon Sep 17 00:00:00 2001
2From: John Wolfe <jwolfe@vmware.com>
3Date: Sun, 21 Aug 2022 07:56:49 -0700
4Subject: [PATCH] Properly check authorization on incoming guestOps requests.
5
6Fix public pipe request checks.  Only a SessionRequest type should
7be accepted on the public pipe.
8
9CVE: CVE-2022-31676
10
11Upstream-Status: Backport
12[https://github.com/vmware/open-vm-tools/commit/70a74758bfe0042c27f15ce590fb21a2bc54d745]
13
14Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
15---
16 open-vm-tools/vgauth/serviceImpl/proto.c | 6 +++++-
17 1 file changed, 5 insertions(+), 1 deletion(-)
18
19diff --git a/open-vm-tools/vgauth/serviceImpl/proto.c b/open-vm-tools/vgauth/serviceImpl/proto.c
20index db7159ee..6c672601 100644
21--- a/open-vm-tools/vgauth/serviceImpl/proto.c
22+++ b/open-vm-tools/vgauth/serviceImpl/proto.c
23@@ -1,5 +1,5 @@
24 /*********************************************************
25- * Copyright (C) 2011-2016,2019-2021 VMware, Inc. All rights reserved.
26+ * Copyright (C) 2011-2016,2019-2022 VMware, Inc. All rights reserved.
27  *
28  * This program is free software; you can redistribute it and/or modify it
29  * under the terms of the GNU Lesser General Public License as published
30@@ -1201,6 +1201,10 @@ Proto_SecurityCheckRequest(ServiceConnection *conn,
31    VGAuthError err;
32    gboolean isSecure = ServiceNetworkIsConnectionPrivateSuperUser(conn);
33
34+   if (conn->isPublic && req->reqType != PROTO_REQUEST_SESSION_REQ) {
35+      return VGAUTH_E_PERMISSION_DENIED;
36+   }
37+
38    switch (req->reqType) {
39       /*
40        * This comes over the public connection; alwsys let it through.
41--
422.25.1
43
44