Sync with vmware-workstation 17.0.1

1 files changed, 61 insertions, 72 deletions

diff --git a/vmnet.patch b/vmnet.patch
index 02952204df1d..ccedc64c39fb 100644
--- a/vmnet.patch
+++ b/vmnet.patch
@@ -319,78 +319,67 @@
     if (port->jack.state == FALSE || hubJack == NULL) {
        return -EINVAL;
     }
-From 78b77816d39a77b1643426ece1ebd48776d83c1b Mon Sep 17 00:00:00 2001
-From: Michal Kubecek <mkubecek@suse.cz>
-Date: Fri, 7 Oct 2022 12:56:44 +0200
-Subject: [PATCH] vmnet: work around field-spanning write warning
-
-The vmnet code uses struct VNet_EventHeader for an event header which is
-followed by variable amount of payload data but does use a flexible array
-member like most similar structures. When building with FORTIFY_SOURCE
-against kernel 6.1-rc1, this results in runtime warnings like
-
-  memcpy: detected field-spanning write (size 28) of single field "&t->event"
-
-in VNetEvent_Send() and VNetUserListenerEventHandler(). Create a helper for
-copying full event structure and for implement it using two separate copy
-statements, one for fixed header and one for the variable payload. Another
-approach would be the use of unsafe_memcpy() but this code does not seem to
-be performance critical so let us split the memcpy() instead.
----
- vmnet-only/vnet.h             | 8 ++++++++
- vmnet-only/vnetEvent.c        | 2 +-
- vmnet-only/vnetUserListener.c | 2 +-
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/vmnet-only/vnet.h b/vmnet-only/vnet.h
-index d6691d5c..d5bb5572 100644
---- a/vmnet-only/vnet.h
-+++ b/vmnet-only/vnet.h
-@@ -274,6 +274,7 @@ typedef struct VNet_EventHeader {
-    uint32 eventId;
-    uint32 classSet;
-    uint32 type;
-+   char payload[];
- } VNet_EventHeader;
- #pragma pack(pop)
- 
-@@ -291,6 +292,13 @@ typedef struct VNet_LinkStateEvent {
- } VNet_LinkStateEvent;
- #pragma pack(pop)
- 
-+static inline void VNet_Event_copy(VNet_EventHeader *dst,
-+			      const VNet_EventHeader *src)
-+{
-+	*dst = *src;
-+	memcpy(dst->payload, src->payload, src->size - sizeof(*src));
-+}
-+
- /*
-  *----------------------------------------------------------------------------
-  */
-diff --git a/vmnet-only/vnetEvent.c b/vmnet-only/vnetEvent.c
-index 3fda7f5a..062398e0 100644
---- a/vmnet-only/vnetEvent.c
-+++ b/vmnet-only/vnetEvent.c
-@@ -402,7 +402,7 @@ VNetEvent_Send(VNetEvent_Sender *s, // IN: a sender
-       p->nextEvent = s->firstEvent;
-       s->firstEvent = p;
+--- a/vmnet/vnetEvent.c
++++ b/vmnet/vnetEvent.c
+@@ -60,10 +60,12 @@
+ 
+ struct VNetEvent_EventNode {
+    VNetEvent_EventNode *nextEvent;
+-   VNet_EventHeader event;
++   union {
++       VNet_EventHeader header;
++       VNet_LinkStateEvent lse;
++   } event;
+ };
+ 
+-#define EVENT_NODE_HEADER_SIZE offsetof(struct VNetEvent_EventNode, event)
+ 
+ struct VNetEvent_Mechanism {
+    VNetKernel_SpinLock lock;          /* mechanism lock */
+@@ -369,6 +371,10 @@
+       return VNetKernel_EINVAL;
     }
--   memcpy(&p->event, e, e->size);
-+   VNet_Event_copy(&p->event, e);
- 
-    /* send event */
-    classSet = e->classSet;
-diff --git a/vmnet-only/vnetUserListener.c b/vmnet-only/vnetUserListener.c
-index 114f3907..e9f51755 100644
---- a/vmnet-only/vnetUserListener.c
-+++ b/vmnet-only/vnetUserListener.c
-@@ -226,7 +226,7 @@ VNetUserListenerEventHandler(void *context,       // IN: the user listener
-       return;
+ 
++   if (e->size > sizeof(p->event)) {
++      return VNetKernel_EINVAL;
++   }
++
+    /* lock */
+    VNetKernel_SpinLockAcquire(&m->lock);
+    m->handlerTask = VNetKernel_ThreadCurrent();
+@@ -378,22 +384,15 @@
+    while (TRUE) {
+        p = *q;
+        if (p == NULL ||
+-           (p->event.eventId == e->eventId && p->event.type == e->type)) {
++           (p->event.header.eventId == e->eventId && p->event.header.type == e->type)) {
+                break;
+            }
+       q = &p->nextEvent;
     }
-    t->nextEvent = NULL;
--   memcpy(&t->event, e, e->size);
-+   VNet_Event_copy(&t->event, e);
  
-    /* append event to event list */
-    userListener = (VNetUserListener*)context;
+-   /* remove previously sent event */
+-   if (p != NULL && p->event.size != e->size) {
+-      *q = p->nextEvent;
+-      VNetKernel_MemoryFree(p);
+-      p = NULL;
+-   }
+-
+    /* insert new event into event list*/
+    if (p == NULL) {
+-      p = VNetKernel_MemoryAllocate(EVENT_NODE_HEADER_SIZE + e->size);
++      p = VNetKernel_MemoryAllocate(sizeof(*p));
+       if (p == NULL) {
+          m->handlerTask = NULL;
+          VNetKernel_SpinLockRelease(&m->lock);
+@@ -485,8 +484,8 @@
+    while (s != NULL) {
+       e = s->firstEvent;
+       while (e != NULL) {
+-         if ((e->event.classSet & classMask) != 0) {
+-            h(data, &e->event);
++         if ((e->event.header.classSet & classMask) != 0) {
++            h(data, &e->event.header);
+          }
+          e = e->nextEvent;
+       }