Skip to content

Instantly share code, notes, and snippets.

@raymond-w-ko

raymond-w-ko/vmware-patch-linux-3.17

Created October 7, 2014 13:46
Show Gist options
  • Save raymond-w-ko/fb791b78ebaad9e0a4bd to your computer and use it in GitHub Desktop.
Save raymond-w-ko/fb791b78ebaad9e0a4bd to your computer and use it in GitHub Desktop.
Download ZIP
Patch for vmware-patch in AUR due to linux 3.17 update
Raw
vmware-patch-linux-3.17
diff -rupN vmware-patch.old/PKGBUILD vmware-patch.new/PKGBUILD
--- vmware-patch.old/PKGBUILD 2014-08-22 09:51:26.000000000 -0400
+++ vmware-patch.new/PKGBUILD 2014-10-07 09:39:07.496993396 -0400
@@ -3,7 +3,7 @@
pkgname=vmware-patch
pkgver=10.0.3
-pkgrel=3
+pkgrel=4
pkgdesc="A post-install configuration solution for VMware Workstation and Player (Plus)"
arch=('i686' 'x86_64')
url="https://wiki.archlinux.org/index.php/Vmware%23Configuration"
@@ -13,13 +13,14 @@ options=('!emptydirs')
install=$pkgname.install
source=('vmware-patch' 'vmware-unpatch' 'vmware.service' 'vmware-usbarbitrator.service' 'vmware-workstation.service'
# Workstation 10.0.2 / Player (Plus) 6.0.2
- 'vmci-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch'
- 'vmmon-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch'
+ 'vmci-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch'
+ 'vmmon-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch'
'vmnet-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch'
- 'vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15.patch'
- 'vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch'
+ 'vmnet-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17.patch'
+ 'vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15.patch'
+ 'vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch'
# Workstation 10.0.1 / Player (Plus) 6.0.1
- 'vmnet-10.0.1-10.0.0-6.0.1-6.0.0-3.16-3.15-3.14-3.13.patch')
+ 'vmnet-10.0.1-10.0.0-6.0.1-6.0.0-3.17-3.16-3.15-3.14-3.13.patch')
package() {
# Directories
@@ -51,6 +52,7 @@ md5sums=('8319ab3a5979fee901ae4db4ed7528
'9228a5d7adf3b0b6663e821807e5c911'
'56a25fee00705466e22767426e76f868'
'acd25c0daccb62af8abf750e6369ae25'
+ 'c7748f36a038bd8a1ead0a50d1541157'
'1893542f8144aa0bb96f5433b9c34158'
'd6086a3289f20f17e6779d5c0a65c2c8'
'd980b5092aeee55edc6dbafb843d886f')
diff -rupN vmware-patch.old/vmci-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch vmware-patch.new/vmci-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch
--- vmware-patch.old/vmci-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch 2014-04-05 18:32:51.000000000 -0400
+++ vmware-patch.new/vmci-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch 1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-diff -rupN vmci-only/linux/driver.c vmci-only/linux/driver.c
---- vmci-only/linux/driver.c 2014-03-31 18:49:14.840009422 +0100
-+++ vmci-only/linux/driver.c 2014-03-31 18:49:21.385009439 +0100
-@@ -737,7 +737,7 @@ LinuxDriver_Ioctl(struct inode *inode,
- goto init_release;
- }
-
-- user = current_uid();
-+ user = from_kuid(current_user_ns(), current_uid());
- retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,
- 0 /* Unused */, vmciLinux->userVersion,
- &user, &vmciLinux->context);
-diff -rupN vmci-only/shared/vm_assert.h vmci-only/shared/vm_assert.h
---- vmci-only/shared/vm_assert.h 2014-03-31 18:49:14.841009422 +0100
-+++ vmci-only/shared/vm_assert.h 2014-03-31 18:49:21.385009439 +0100
-@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
- __FILE__, __LINE__, __FUNCTION__, \
- _fix))
- #else
-+ #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
- #define DEPRECATED(_fix) do {} while (0)
- #endif
-
diff -rupN vmware-patch.old/vmci-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch vmware-patch.new/vmci-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch
--- vmware-patch.old/vmci-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch 1969-12-31 19:00:00.000000000 -0500
+++ vmware-patch.new/vmci-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch 2014-04-05 18:32:51.000000000 -0400
@@ -0,0 +1,23 @@
+diff -rupN vmci-only/linux/driver.c vmci-only/linux/driver.c
+--- vmci-only/linux/driver.c 2014-03-31 18:49:14.840009422 +0100
++++ vmci-only/linux/driver.c 2014-03-31 18:49:21.385009439 +0100
+@@ -737,7 +737,7 @@ LinuxDriver_Ioctl(struct inode *inode,
+ goto init_release;
+ }
+
+- user = current_uid();
++ user = from_kuid(current_user_ns(), current_uid());
+ retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,
+ 0 /* Unused */, vmciLinux->userVersion,
+ &user, &vmciLinux->context);
+diff -rupN vmci-only/shared/vm_assert.h vmci-only/shared/vm_assert.h
+--- vmci-only/shared/vm_assert.h 2014-03-31 18:49:14.841009422 +0100
++++ vmci-only/shared/vm_assert.h 2014-03-31 18:49:21.385009439 +0100
+@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
+ __FILE__, __LINE__, __FUNCTION__, \
+ _fix))
+ #else
++ #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
+ #define DEPRECATED(_fix) do {} while (0)
+ #endif
+
diff -rupN vmware-patch.old/vmmon-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch vmware-patch.new/vmmon-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch
--- vmware-patch.old/vmmon-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch 2014-04-05 18:32:56.000000000 -0400
+++ vmware-patch.new/vmmon-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch 1969-12-31 19:00:00.000000000 -0500
@@ -1,25 +0,0 @@
-diff -rupN vmmon-only/include/vm_assert.h vmmon-only/include/vm_assert.h
---- vmmon-only/include/vm_assert.h 2014-03-31 18:49:14.835009422 +0100
-+++ vmmon-only/include/vm_assert.h 2014-03-31 18:49:21.380009439 +0100
-@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
- __FILE__, __LINE__, __FUNCTION__, \
- _fix))
- #else
-+ #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
- #define DEPRECATED(_fix) do {} while (0)
- #endif
-
-diff -rupN vmmon-only/linux/driver.c vmmon-only/linux/driver.c
---- vmmon-only/linux/driver.c 2014-03-31 18:49:14.834009422 +0100
-+++ vmmon-only/linux/driver.c 2014-03-31 18:49:21.379009439 +0100
-@@ -1338,7 +1338,9 @@ LinuxDriverReadTSC(void *data, // OUT:
- *-----------------------------------------------------------------------------
- */
-
--__attribute__((always_inline)) static Bool
-+#include <linux/compiler-gcc.h>
-+
-+__always_inline static Bool
- LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
- {
- TSCDelta tscDelta;
diff -rupN vmware-patch.old/vmmon-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch vmware-patch.new/vmmon-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch
--- vmware-patch.old/vmmon-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch 1969-12-31 19:00:00.000000000 -0500
+++ vmware-patch.new/vmmon-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch 2014-04-05 18:32:56.000000000 -0400
@@ -0,0 +1,25 @@
+diff -rupN vmmon-only/include/vm_assert.h vmmon-only/include/vm_assert.h
+--- vmmon-only/include/vm_assert.h 2014-03-31 18:49:14.835009422 +0100
++++ vmmon-only/include/vm_assert.h 2014-03-31 18:49:21.380009439 +0100
+@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
+ __FILE__, __LINE__, __FUNCTION__, \
+ _fix))
+ #else
++ #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
+ #define DEPRECATED(_fix) do {} while (0)
+ #endif
+
+diff -rupN vmmon-only/linux/driver.c vmmon-only/linux/driver.c
+--- vmmon-only/linux/driver.c 2014-03-31 18:49:14.834009422 +0100
++++ vmmon-only/linux/driver.c 2014-03-31 18:49:21.379009439 +0100
+@@ -1338,7 +1338,9 @@ LinuxDriverReadTSC(void *data, // OUT:
+ *-----------------------------------------------------------------------------
+ */
+
+-__attribute__((always_inline)) static Bool
++#include <linux/compiler-gcc.h>
++
++__always_inline static Bool
+ LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
+ {
+ TSCDelta tscDelta;
diff -rupN vmware-patch.old/vmnet-10.0.1-10.0.0-6.0.1-6.0.0-3.16-3.15-3.14-3.13.patch vmware-patch.new/vmnet-10.0.1-10.0.0-6.0.1-6.0.0-3.16-3.15-3.14-3.13.patch
--- vmware-patch.old/vmnet-10.0.1-10.0.0-6.0.1-6.0.0-3.16-3.15-3.14-3.13.patch 2014-08-19 13:58:29.000000000 -0400
+++ vmware-patch.new/vmnet-10.0.1-10.0.0-6.0.1-6.0.0-3.16-3.15-3.14-3.13.patch 1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-diff -u vmnet-only.a/filter.c vmnet-only/filter.c
---- vmnet-only.a/filter.c 2014-04-02 21:34:26.935944394 +0300
-+++ vmnet-only/filter.c 2013-10-18 22:11:55.000000000 +0300
-@@ -203,7 +203,7 @@
- #endif
-
- static unsigned int
--VNetFilterHookFn(unsigned int hooknum, // IN:
-+VNetFilterHookFn(const struct nf_hook_ops *ops, // IN:
- #ifdef VMW_NFHOOK_USES_SKB
- struct sk_buff *skb, // IN:
- #else
-@@ -252,7 +252,7 @@
-
- /* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */
- /* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */
-- transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
-+ transmit = (ops->hooknum == VMW_NF_INET_POST_ROUTING);
-
- packetHeader = compat_skb_network_header(skb);
- ip = (struct iphdr*)packetHeader;
diff -rupN vmware-patch.old/vmnet-10.0.1-10.0.0-6.0.1-6.0.0-3.17-3.16-3.15-3.14-3.13.patch vmware-patch.new/vmnet-10.0.1-10.0.0-6.0.1-6.0.0-3.17-3.16-3.15-3.14-3.13.patch
--- vmware-patch.old/vmnet-10.0.1-10.0.0-6.0.1-6.0.0-3.17-3.16-3.15-3.14-3.13.patch 1969-12-31 19:00:00.000000000 -0500
+++ vmware-patch.new/vmnet-10.0.1-10.0.0-6.0.1-6.0.0-3.17-3.16-3.15-3.14-3.13.patch 2014-08-19 13:58:29.000000000 -0400
@@ -0,0 +1,21 @@
+diff -u vmnet-only.a/filter.c vmnet-only/filter.c
+--- vmnet-only.a/filter.c 2014-04-02 21:34:26.935944394 +0300
++++ vmnet-only/filter.c 2013-10-18 22:11:55.000000000 +0300
+@@ -203,7 +203,7 @@
+ #endif
+
+ static unsigned int
+-VNetFilterHookFn(unsigned int hooknum, // IN:
++VNetFilterHookFn(const struct nf_hook_ops *ops, // IN:
+ #ifdef VMW_NFHOOK_USES_SKB
+ struct sk_buff *skb, // IN:
+ #else
+@@ -252,7 +252,7 @@
+
+ /* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */
+ /* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */
+- transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++ transmit = (ops->hooknum == VMW_NF_INET_POST_ROUTING);
+
+ packetHeader = compat_skb_network_header(skb);
+ ip = (struct iphdr*)packetHeader;
diff -rupN vmware-patch.old/vmnet-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17.patch vmware-patch.new/vmnet-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17.patch
--- vmware-patch.old/vmnet-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17.patch 1969-12-31 19:00:00.000000000 -0500
+++ vmware-patch.new/vmnet-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17.patch 2014-10-07 09:38:55.040112256 -0400
@@ -0,0 +1,23 @@
+diff -rupN vmnet-only.a/vm_assert.h vmnet-only/vm_assert.h
+--- vmnet-only.a/vm_assert.h 2014-03-31 18:49:14.845009422 +0100
++++ vmnet-only/vm_assert.h 2014-03-31 18:49:21.390009439 +0100
+@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
+ __FILE__, __LINE__, __FUNCTION__, \
+ _fix))
+ #else
++ #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
+ #define DEPRECATED(_fix) do {} while (0)
+ #endif
+
+diff -rupN vmnet-only.old/netif.c vmnet-only.new/netif.c
+--- vmnet-only.a/netif.c 2014-06-12 20:38:25.000000000 -0400
++++ vmnet-only/netif.c 2014-10-07 09:34:54.296044885 -0400
+@@ -149,7 +149,7 @@ VNetNetIf_Create(char *devName, // IN:
+ memcpy(deviceName, devName, sizeof deviceName);
+ NULL_TERMINATE_STRING(deviceName);
+
+- dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup);
++ dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, VNetNetIfSetup);
+ if (!dev) {
+ retval = -ENOMEM;
+ goto out;
diff -rupN vmware-patch.old/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch vmware-patch.new/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch
--- vmware-patch.old/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch 2014-04-05 18:33:04.000000000 -0400
+++ vmware-patch.new/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15-3.14.patch 1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-diff -rupN vsock-only/linux/af_vsock.c vsock-only/linux/af_vsock.c
---- vsock-only/linux/af_vsock.c 2014-03-31 18:49:14.837009422 +0100
-+++ vsock-only/linux/af_vsock.c 2014-03-31 18:49:21.381009439 +0100
-@@ -2869,7 +2869,7 @@ __VSockVmciCreate(struct net *net,
- vsk->connectTimeout = psk->connectTimeout;
- } else {
- vsk->trusted = capable(CAP_NET_ADMIN);
-- vsk->owner = current_uid();
-+ vsk->owner = from_kuid(current_user_ns(), current_uid());
- vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE;
- vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN;
- vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX;
-diff -rupN vsock-only/shared/vm_assert.h vsock-only/shared/vm_assert.h
---- vsock-only/shared/vm_assert.h 2014-03-31 18:49:14.839009422 +0100
-+++ vsock-only/shared/vm_assert.h 2014-03-31 18:49:21.382009439 +0100
-@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
- __FILE__, __LINE__, __FUNCTION__, \
- _fix))
- #else
-+ #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
- #define DEPRECATED(_fix) do {} while (0)
- #endif
-
diff -rupN vmware-patch.old/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15.patch vmware-patch.new/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15.patch
--- vmware-patch.old/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15.patch 2014-06-09 13:12:37.000000000 -0400
+++ vmware-patch.new/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.16-3.15.patch 1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-diff -rupN vsock-only/linux/notify.c vsock-only/linux/notify.c
---- vsock-only/linux/notify.c 2014-04-15 03:11:41.000000000 +0530
-+++ vsock-only/linux/notify.c 2014-05-27 21:36:56.713291909 +0530
-@@ -516,7 +516,7 @@ VSockVmciHandleWrote(struct sock *sk,
- PKT_FIELD(vsk, sentWaitingRead) = FALSE;
- #endif
-
-- sk->sk_data_ready(sk, 0);
-+ sk->sk_data_ready(sk);
- }
-
-
-diff -rupN vsock-only/linux/notifyQState.c vsock-only/linux/notifyQState.c
---- vsock-only/linux/notifyQState.c 2014-04-15 03:11:41.000000000 +0530
-+++ vsock-only/linux/notifyQState.c 2014-05-27 21:38:52.561286734 +0530
-@@ -164,7 +164,7 @@ VSockVmciHandleWrote(struct sock *sk,
- struct sockaddr_vm *dst, // IN: unused
- struct sockaddr_vm *src) // IN: unused
- {
-- sk->sk_data_ready(sk, 0);
-+ sk->sk_data_ready(sk);
- }
-
-
-@@ -566,7 +566,7 @@ VSockVmciNotifyPktRecvPostDequeue(struct
- }
-
- /* See the comment in VSockVmciNotifyPktSendPostEnqueue */
-- sk->sk_data_ready(sk, 0);
-+ sk->sk_data_ready(sk);
- }
-
- return err;
diff -rupN vmware-patch.old/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch vmware-patch.new/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch
--- vmware-patch.old/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch 1969-12-31 19:00:00.000000000 -0500
+++ vmware-patch.new/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15-3.14.patch 2014-04-05 18:33:04.000000000 -0400
@@ -0,0 +1,23 @@
+diff -rupN vsock-only/linux/af_vsock.c vsock-only/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c 2014-03-31 18:49:14.837009422 +0100
++++ vsock-only/linux/af_vsock.c 2014-03-31 18:49:21.381009439 +0100
+@@ -2869,7 +2869,7 @@ __VSockVmciCreate(struct net *net,
+ vsk->connectTimeout = psk->connectTimeout;
+ } else {
+ vsk->trusted = capable(CAP_NET_ADMIN);
+- vsk->owner = current_uid();
++ vsk->owner = from_kuid(current_user_ns(), current_uid());
+ vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE;
+ vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN;
+ vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX;
+diff -rupN vsock-only/shared/vm_assert.h vsock-only/shared/vm_assert.h
+--- vsock-only/shared/vm_assert.h 2014-03-31 18:49:14.839009422 +0100
++++ vsock-only/shared/vm_assert.h 2014-03-31 18:49:21.382009439 +0100
+@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
+ __FILE__, __LINE__, __FUNCTION__, \
+ _fix))
+ #else
++ #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
+ #define DEPRECATED(_fix) do {} while (0)
+ #endif
+
diff -rupN vmware-patch.old/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15.patch vmware-patch.new/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15.patch
--- vmware-patch.old/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15.patch 1969-12-31 19:00:00.000000000 -0500
+++ vmware-patch.new/vsock-10.0.3-10.0.2-10.0.1-10.0.0-6.0.3-6.0.2-6.0.1-6.0.0-3.17-3.16-3.15.patch 2014-06-09 13:12:37.000000000 -0400
@@ -0,0 +1,33 @@
+diff -rupN vsock-only/linux/notify.c vsock-only/linux/notify.c
+--- vsock-only/linux/notify.c 2014-04-15 03:11:41.000000000 +0530
++++ vsock-only/linux/notify.c 2014-05-27 21:36:56.713291909 +0530
+@@ -516,7 +516,7 @@ VSockVmciHandleWrote(struct sock *sk,
+ PKT_FIELD(vsk, sentWaitingRead) = FALSE;
+ #endif
+
+- sk->sk_data_ready(sk, 0);
++ sk->sk_data_ready(sk);
+ }
+
+
+diff -rupN vsock-only/linux/notifyQState.c vsock-only/linux/notifyQState.c
+--- vsock-only/linux/notifyQState.c 2014-04-15 03:11:41.000000000 +0530
++++ vsock-only/linux/notifyQState.c 2014-05-27 21:38:52.561286734 +0530
+@@ -164,7 +164,7 @@ VSockVmciHandleWrote(struct sock *sk,
+ struct sockaddr_vm *dst, // IN: unused
+ struct sockaddr_vm *src) // IN: unused
+ {
+- sk->sk_data_ready(sk, 0);
++ sk->sk_data_ready(sk);
+ }
+
+
+@@ -566,7 +566,7 @@ VSockVmciNotifyPktRecvPostDequeue(struct
+ }
+
+ /* See the comment in VSockVmciNotifyPktSendPostEnqueue */
+- sk->sk_data_ready(sk, 0);
++ sk->sk_data_ready(sk);
+ }
+
+ return err;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment