1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
|
--- a/vmnet/Makefile
+++ b/vmnet/Makefile
@@ -43,7 +43,11 @@ INCLUDE += -I$(SRCROOT)/shared
endif
+ifdef KVERSION
+VM_UNAME = $(KVERSION)
+else
VM_UNAME = $(shell uname -r)
+endif
# Header directory for the running kernel
ifdef LINUXINCLUDE
--- a/vmnet/userif.c
+++ b/vmnet/userif.c
Fixing VMWare Player on Linux when using DHCP addresses: https://www.nikhef.nl/~janjust/vmnet/
@@ -1029,6 +1029,9 @@
userIf = (VNetUserIF *)port->jack.private;
hubJack = port->jack.peer;
+ /* never send link down events */
+ if (!linkUp) return 0;
+
if (port->jack.state == FALSE || hubJack == NULL) {
return -EINVAL;
}
--- a/vmnet/vnetUserListener.c
--- b/vmnet/vnetUserListener.c
@@ -42,10 +42,12 @@
struct VNetUserListener_EventNode {
VNetUserListener_EventNode *nextEvent;
- VNet_EventHeader event;
+ union {
+ VNet_EventHeader header;
+ VNet_LinkStateEvent lse;
+ } event;
};
-#define EVENT_NODE_HEADER_SIZE offsetof(struct VNetUserListener_EventNode, event)
typedef struct VNetUserListener {
VNetPort port; /* base port/jack */
@@ -220,7 +222,7 @@
VNetUserListener_EventNode *t;
/* allocate and initialize event node */
- t = kmalloc(EVENT_NODE_HEADER_SIZE + e->size, GFP_ATOMIC);
+ t = kmalloc(sizeof *t, GFP_ATOMIC);
if (t == NULL) {
LOG(0, (KERN_DEBUG "VNetUserListenerEventHandler, out of memory\n"));
return;
@@ -299,7 +301,7 @@
spin_unlock(&userListener->lock);
/* return data and free event */
- n = t->event.size;
+ n = t->event.header.size;
if (count < n) {
n = count;
}
From 0ca979d4bd06144204d720bb82f0a1e29024f9fa Mon Sep 17 00:00:00 2001
From: Michal Kubecek <mkubecek@suse.cz>
Date: Wed, 18 Jan 2023 00:19:52 +0100
Subject: [PATCH] vmnet: use explicit module_init() and module_exit() (#187)
While vmmon module already uses explicit module_init() and module_exit()
for its init and cleanup function, vmnet relies on traditional magic names
init_module() and cleanup_module(). Apparently this has an unfortunate side
effect that the two functions are not identified as indirect call targets
by objdump and they get "sealed" when the module is built against and
loaded into an IBT enabled kernel.
Starting with 6.3-rc1, objtool is going to warn about this issue,
indicating that the legacy module initialization is deprecated and
module_init() and module_exit() macros should be used instead so do that
for vmnet as well.
---
vmnet-only/driver.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
index 197a213..b22cbfb 100644
--- a/vmnet-only/driver.c
+++ b/vmnet-only/driver.c
@@ -279,7 +279,7 @@ VNetRemovePortFromList(const VNetPort *port) // IN: port to remove from list
/*
*----------------------------------------------------------------------
*
- * init_module --
+ * vmnet_init_module --
*
* linux module entry point. Called by /sbin/insmod command.
* Initializes module and Registers this driver for a
@@ -296,7 +296,7 @@ VNetRemovePortFromList(const VNetPort *port) // IN: port to remove from list
*/
int
-init_module(void)
+vmnet_init_module(void)
{
int retval;
@@ -358,7 +358,7 @@ init_module(void)
/*
*----------------------------------------------------------------------
*
- * cleanup_module --
+ * vmnet_cleanup_module --
*
* Called by /sbin/rmmod. Unregisters this driver for a
* vnet major #, and deinitializes the modules. The 64-bit
@@ -375,7 +375,7 @@ init_module(void)
*/
void
-cleanup_module(void)
+vmnet_cleanup_module(void)
{
unregister_chrdev(VNET_MAJOR_NUMBER, "vmnet");
VNetProtoUnregister();
@@ -1670,3 +1670,5 @@ MODULE_LICENSE("GPL v2");
* by default (i.e., neither mkinitrd nor modprobe will accept it).
*/
MODULE_INFO(supported, "external");
+module_init(vmnet_init_module);
+module_exit(vmnet_cleanup_module);
Patch inspired from https://github.com/mkubecek/vmware-host-modules/commit/b75cd616cca0a4c9ff22124c4c91d218e64e6205.patch
--- a/vmnet/bridge.c
+++ b/vmnet/bridge.c
@@ -44,6 +44,9 @@
#include <linux/if_arp.h>
#include <net/tcp.h>
#include <net/ipv6.h>
+#if !defined(SKB_GSO_CB)
+#include <net/gso.h>
+#endif
#ifdef CONFIG_NET_RADIO
# include <linux/wireless.h>
|