pool/open-vm-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 999301 from home:kallan:branches:Virtualization:VMware

Browse Source 
- Update to 12.1.0 (build 20219665) (boo#1202733)
  + New/Updated features:
    - Contains security update fix for (bsc#1202657) - (CVE-2022-31676)
      VUL-0: CVE-2022-31676: open-vm-tools:
      local privilege escalation vulnerability
  + A number of Coverity reported issues have been addressed.
  + [FTBFS] Fix the build of the ContainerInfo plugin for a 32-bit Linux
    release:
      https://github.com/vmware/open-vm-tools/pull/588
  + Make HgfsConvertFromNtTimeNsec aware of 64-bit time_t on i386 (32-bit)
    This change incorporates the support of 64 bit time epoch conversion
    from Windows NT time to Unix Epoch time on i386.
      https://github.com/vmware/open-vm-tools/pull/387
- Drop patch now contained in 12.1.0:
  + gcc_size_t.patch

OBS-URL: https://build.opensuse.org/request/show/999301
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=419
This commit is contained in:
Kirk Allan 2022-08-25 23:31:09 +00:00 committed by Git OBS Bridge
parent 164265a050
commit 305fe48d1a
5 changed files with 24 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
gcc_size_t.patch
View File

@ -1,123 +0,0 @@
commit de6d129476724668b8903e2a87654f50ba21b1b2
Author: John Wolfe <jwolfe@vmware.com>
Date: Thu Feb 17 14:51:25 2022 -0800
asyncsocket.c: Use size_t in place of int type for array size and indexing.
Glibc 2.35 with GCC 11 and 12 produces additional warnings about strings
and array bounds. Switching from "int" to "size_t" type for variable
used for the array size and element indexing.
GCC warned when an integer value is passed as the size of the
struct pollfd array to poll().
Fixes https://github.com/vmware/open-vm-tools/issues/570
diff --git a/open-vm-tools/lib/asyncsocket/asyncSocketVTable.h b/open-vm-tools/lib/asyncsocket/asyncSocketVTable.h
index a69b6567..c068ff50 100644
--- a/open-vm-tools/lib/asyncsocket/asyncSocketVTable.h
+++ b/open-vm-tools/lib/asyncsocket/asyncSocketVTable.h
@@ -1,5 +1,5 @@
/*********************************************************
- * Copyright (C) 2011,2014-2017,2019-2021 VMware, Inc. All rights reserved.
+ * Copyright (C) 2011,2014-2017,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
@@ -131,8 +131,8 @@ typedef struct AsyncSocketVTable {
int timeoutMS);
int (*doOneMsg)(AsyncSocket *s, Bool read, int timeoutMS);
int (*waitForConnection)(AsyncSocket *s, int timeoutMS);
- int (*waitForReadMultiple)(AsyncSocket **asock, int numSock, int timeoutMS,
- int *outIdx);
+ int (*waitForReadMultiple)(AsyncSocket **asock, size_t numSock,
+ int timeoutMS, int *outIdx);
int (*peek)(AsyncSocket *asock, void *buf, int len, void *cb, void *cbData);
/*
diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c
index ecb5a933..2bf97b54 100644
--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c
+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c
@@ -370,7 +370,7 @@ static int AsyncTCPSocketRecvPartialBlocking(AsyncSocket *s, void *buf, int len,
static int AsyncTCPSocketSendBlocking(AsyncSocket *s, void *buf, int len,
int *sent, int timeoutMS);
static int AsyncTCPSocketDoOneMsg(AsyncSocket *s, Bool read, int timeoutMS);
-static int AsyncTCPSocketWaitForReadMultiple(AsyncSocket **asock, int numSock,
+static int AsyncTCPSocketWaitForReadMultiple(AsyncSocket **asock, size_t numSock,
int timeoutMS, int *outIdx);
static int AsyncTCPSocketSetOption(AsyncSocket *asyncSocket,
AsyncSocketOpts_Layer layer,
@@ -2807,7 +2807,7 @@ AsyncTCPSocketPeek(AsyncSocket *base, // IN:
static int
AsyncTCPSocketPollWork(AsyncTCPSocket **asock, // IN:
- int numSock, // IN:
+ size_t numSock, // IN:
void *p, // IN:
Bool read, // IN:
int timeoutMS, // IN:
@@ -2827,11 +2827,11 @@ AsyncTCPSocketPollWork(AsyncTCPSocket **asock, // IN:
struct fd_set rwfds;
struct fd_set exceptfds;
#endif
- int i;
+ size_t i;
int retval;
ASSERT(outAsock != NULL && *outAsock == NULL && asock != NULL &&
- numSock > 0);
+ numSock != 0);
for (i = 0; i < numSock; i++) {
if (read && SSL_Pending(asock[i]->sslSock)) {
@@ -2852,7 +2852,7 @@ AsyncTCPSocketPollWork(AsyncTCPSocket **asock, // IN:
retval = poll(pfd, numSock, timeoutMS);
AsyncTCPSocketLock(parentSock);
} else {
- for (i = numSock - 1; i >= 0; i--) {
+ for (i = numSock; i-- > 0; ) {
AsyncTCPSocketUnlock(asock[i]);
}
retval = poll(pfd, numSock, timeoutMS);
@@ -2878,7 +2878,7 @@ AsyncTCPSocketPollWork(AsyncTCPSocket **asock, // IN:
&exceptfds, timeoutMS >= 0 ? &tv : NULL);
AsyncTCPSocketLock(parentSock);
} else {
- for (i = numSock - 1; i >= 0; i--) {
+ for (i = numSock; i-- > 0; ) {
AsyncTCPSocketUnlock(asock[i]);
}
retval = select(1, read ? &rwfds : NULL, read ? NULL : &rwfds,
@@ -3032,7 +3032,7 @@ AsyncTCPSocketPoll(AsyncTCPSocket *s, // IN:
#else
void *p = NULL;
#endif
- int numSock = 0;
+ size_t numSock = 0;
if (read && s->fd == -1) {
if (!s->listenAsock4 && !s->listenAsock6) {
@@ -3078,11 +3078,11 @@ AsyncTCPSocketPoll(AsyncTCPSocket *s, // IN:
static int
AsyncTCPSocketWaitForReadMultiple(AsyncSocket **asock, // IN:
- int numSock, // IN:
+ size_t numSock, // IN:
int timeoutMS, // IN:
int *outIdx) // OUT:
{
- int i;
+ size_t i;
int err;
AsyncTCPSocket *outAsock = NULL;
#ifndef _WIN32
@@ -3096,7 +3096,7 @@ AsyncTCPSocketWaitForReadMultiple(AsyncSocket **asock, // IN:
}
err = AsyncTCPSocketPollWork((AsyncTCPSocket **)asock, numSock, p, TRUE,
timeoutMS, NULL, &outAsock);
- for (i = numSock - 1; i >= 0; i--) {
+ for (i = numSock; i-- > 0; ) {
AsyncTCPSocket *tcpAsock = TCPSocket(asock[i]);
if (outAsock == tcpAsock) {
*outIdx = i;

3
open-vm-tools-12.0.0-19345655.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea370217a213802f91b01231e28298bbe54134822351fb5cc70255d80ba0e775
size 4346397

3
open-vm-tools-12.1.0-20219665.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f9cff769cb60d3e570b8dfed98179b345b089ee3cc31a60d80a4fcca1cc220ee
size 4355225

19
open-vm-tools.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu Aug 25 15:57:57 UTC 2022 - Kirk Allan <kallan@suse.com>
- Update to 12.1.0 (build 20219665) (boo#1202733)
+ New/Updated features:
- Contains security update fix for (bsc#1202657) - (CVE-2022-31676)
VUL-0: CVE-2022-31676: open-vm-tools:
local privilege escalation vulnerability
+ A number of Coverity reported issues have been addressed.
+ [FTBFS] Fix the build of the ContainerInfo plugin for a 32-bit Linux
release:
https://github.com/vmware/open-vm-tools/pull/588
+ Make HgfsConvertFromNtTimeNsec aware of 64-bit time_t on i386 (32-bit)
This change incorporates the support of 64 bit time epoch conversion
from Windows NT time to Unix Epoch time on i386.
https://github.com/vmware/open-vm-tools/pull/387
- Drop patch now contained in 12.1.0:
+ gcc_size_t.patch
-------------------------------------------------------------------
Mon Mar 28 15:09:44 UTC 2022 - Kirk Allan <kallan@suse.com>

6
open-vm-tools.spec
View File

@ -40,8 +40,8 @@
Name: open-vm-tools
%define subname open-vm-tools
%define tarname open-vm-tools
%define bldnum 19345655
Version: 12.0.0
%define bldnum 20219665
Version: 12.1.0
Release: 0
Summary: Open Virtual Machine Tools
License: BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-only
@ -148,7 +148,6 @@ Obsoletes: open-vm-tools-deploypkg <= 10.0.5
Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
ExclusiveArch: %ix86 x86_64 aarch64
#Upstream patches
Patch1: gcc_size_t.patch
#SUSE specific patches
Patch0: pam-vmtoolsd.patch
@ -240,7 +239,6 @@ if you intend to create own plugins for vmtoolsd.
# fix for an rpmlint warning regarding wrong line feeds
sed -i -e "s/\r//" README
#Upstream patches
%patch1 -p2
#SUSE specific patches
%patch0 -p2