API tools faq
paste
Advertisement
Guest User

Vmware Workstation 10.0.2 build-1744117 patch Linux 3.14.2

a guest
Apr 29th, 2014
679
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.87 KB | None | 0 0
raw download clone embed print report
  1. diff -pur a/vmblock-only/linux/control.c b/vmblock-only/linux/control.c
  2. --- a/vmblock-only/linux/control.c  2014-04-15 01:41:40.000000000 +0400
  3. +++ b/vmblock-only/linux/control.c  2014-04-30 03:14:23.547585000 +0400
  4. @@ -208,9 +208,10 @@ SetupProcDevice(void)
  5.     VMBlockSetProcEntryOwner(controlProcMountpoint);
  6.  
  7.     /* Create /proc/fs/vmblock/dev */
  8. -   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
  9. +   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
  10.                                          VMBLOCK_CONTROL_MODE,
  11. -                                        controlProcDirEntry);
  12. +                                        controlProcDirEntry,
  13. +                   &ControlFileOps);
  14.     if (!controlProcEntry) {
  15.        Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
  16.        remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
  17. @@ -218,7 +219,6 @@ SetupProcDevice(void)
  18.        return -EINVAL;
  19.     }
  20.  
  21. -   controlProcEntry->proc_fops = &ControlFileOps;
  22.     return 0;
  23.  }
  24.  
  25. @@ -282,7 +282,7 @@ ExecuteBlockOp(const char __user *buf,
  26.     int i;
  27.     int retval;
  28.  
  29. -   name = getname(buf);
  30. +   name = (char *)getname(buf)->name;
  31.     if (IS_ERR(name)) {
  32.        return PTR_ERR(name);
  33.     }
  34. diff -pur a/vmblock-only/linux/file.c b/vmblock-only/linux/file.c
  35. --- a/vmblock-only/linux/file.c 2014-04-15 01:41:40.000000000 +0400
  36. +++ b/vmblock-only/linux/file.c 2014-04-30 03:16:58.239585000 +0400
  37. @@ -237,7 +237,8 @@ FileOpRelease(struct inode *inode, // IN
  38.  
  39.  
  40.  struct file_operations RootFileOps = {
  41. -   .readdir = FileOpReaddir,
  42. +   .owner = THIS_MODULE,
  43. +   .llseek = no_llseek,
  44.     .open    = FileOpOpen,
  45.     .release = FileOpRelease,
  46.  };
  47. diff -pur a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c
  48. --- a/vmblock-only/linux/inode.c    2014-04-15 01:41:40.000000000 +0400
  49. +++ b/vmblock-only/linux/inode.c    2014-04-30 03:25:58.574585000 +0400
  50. @@ -35,8 +35,14 @@
  51.  
  52.  
  53.  /* Inode operations */
  54. +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
  55.  static struct dentry *InodeOpLookup(struct inode *dir,
  56.                                      struct dentry *dentry, struct nameidata *nd);
  57. +#else
  58. +static struct dentry *InodeOpLookup(struct inode *dir,
  59. +                                    struct dentry *dentry, unsigned int);
  60. +#endif
  61. +
  62.  static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
  63.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
  64.  static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
  65. @@ -75,7 +81,7 @@ static struct inode_operations LinkInode
  66.  static struct dentry *
  67.  InodeOpLookup(struct inode *dir,      // IN: parent directory's inode
  68.                struct dentry *dentry,  // IN: dentry to lookup
  69. -              struct nameidata *nd)   // IN: lookup intent and information
  70. +              unsigned int flags)   // IN: lookup intent and information
  71.  {
  72.     char *filename;
  73.     struct inode *inode;
  74. @@ -135,7 +141,8 @@ InodeOpLookup(struct inode *dir,      //
  75.     inode->i_size = INODE_TO_IINFO(inode)->nameLen;
  76.     inode->i_version = 1;
  77.     inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
  78. -   inode->i_uid = inode->i_gid = 0;
  79. +   inode->i_gid = make_kgid(current_user_ns(), 0);
  80. +   inode->i_uid = make_kuid(current_user_ns(), 0);
  81.     inode->i_op = &LinkInodeOps;
  82.  
  83.     d_add(dentry, inode);
  84. @@ -221,8 +228,7 @@ InodeOpFollowlink(struct dentry *dentry,
  85.        goto out;
  86.     }
  87.  
  88. -   ret = vfs_follow_link(nd, iinfo->name);
  89. -
  90. +   nd_set_link(nd, iinfo->name);
  91.  out:
  92.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
  93.     return ERR_PTR(ret);
  94. diff -pur a/vmblock-only/shared/vm_assert.h b/vmblock-only/shared/vm_assert.h
  95. --- a/vmblock-only/shared/vm_assert.h   2014-04-15 01:41:41.000000000 +0400
  96. +++ b/vmblock-only/shared/vm_assert.h   2014-04-30 03:06:30.547585000 +0400
  97. @@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
  98.                                         __FILE__, __LINE__, __FUNCTION__, \
  99.                                         _fix))
  100.  #else
  101. +   #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
  102.     #define DEPRECATED(_fix) do {} while (0)
  103.  #endif
  104.  
  105. diff -pur a/vmci-only/linux/driver.c b/vmci-only/linux/driver.c
  106. --- a/vmci-only/linux/driver.c  2014-04-15 01:41:40.000000000 +0400
  107. +++ b/vmci-only/linux/driver.c  2014-04-30 03:27:49.275585000 +0400
  108. @@ -737,7 +737,7 @@ LinuxDriver_Ioctl(struct inode *inode,
  109.           goto init_release;
  110.        }
  111.  
  112. -      user = current_uid();
  113. +      user = from_kuid(&init_user_ns, current_uid());
  114.        retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,
  115.                                         0 /* Unused */, vmciLinux->userVersion,
  116.                                         &user, &vmciLinux->context);
  117. diff -pur a/vmci-only/shared/vm_assert.h b/vmci-only/shared/vm_assert.h
  118. --- a/vmci-only/shared/vm_assert.h  2014-04-15 01:41:41.000000000 +0400
  119. +++ b/vmci-only/shared/vm_assert.h  2014-04-30 03:28:34.071585000 +0400
  120. @@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
  121.                                         __FILE__, __LINE__, __FUNCTION__, \
  122.                                         _fix))
  123.  #else
  124. +   #undef DEPRECATED
  125.     #define DEPRECATED(_fix) do {} while (0)
  126.  #endif
  127.  
  128. diff -pur a/vmmon-only/include/vm_assert.h b/vmmon-only/include/vm_assert.h
  129. --- a/vmmon-only/include/vm_assert.h    2014-04-15 04:06:20.000000000 +0400
  130. +++ b/vmmon-only/include/vm_assert.h    2014-04-30 03:07:34.868585000 +0400
  131. @@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
  132.                                         __FILE__, __LINE__, __FUNCTION__, \
  133.                                         _fix))
  134.  #else
  135. +   #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */   
  136.     #define DEPRECATED(_fix) do {} while (0)
  137.  #endif
  138.  
  139. diff -pur a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
  140. --- a/vmmon-only/linux/driver.c 2014-04-15 04:06:21.000000000 +0400
  141. +++ b/vmmon-only/linux/driver.c 2014-04-30 03:08:21.206585000 +0400
  142. @@ -1338,7 +1338,7 @@ LinuxDriverReadTSC(void *data,   // OUT:
  143.   *-----------------------------------------------------------------------------
  144.   */
  145.  
  146. -__attribute__((always_inline)) static Bool
  147. +__always_inline static Bool
  148.  LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
  149.  {
  150.     TSCDelta tscDelta;
  151. diff -pur a/vmnet-only/vm_assert.h b/vmnet-only/vm_assert.h
  152. --- a/vmnet-only/vm_assert.h    2014-04-15 04:06:21.000000000 +0400
  153. +++ b/vmnet-only/vm_assert.h    2014-04-30 03:09:58.375585000 +0400
  154. @@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
  155.                                         __FILE__, __LINE__, __FUNCTION__, \
  156.                                         _fix))
  157.  #else
  158. +   #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
  159.     #define DEPRECATED(_fix) do {} while (0)
  160.  #endif
  161.  
  162. diff -pur a/vsock-only/linux/af_vsock.c b/vsock-only/linux/af_vsock.c
  163. --- a/vsock-only/linux/af_vsock.c   2014-04-15 01:41:41.000000000 +0400
  164. +++ b/vsock-only/linux/af_vsock.c   2014-04-30 03:31:26.075585000 +0400
  165. @@ -2869,7 +2869,7 @@ __VSockVmciCreate(struct net *net,
  166.        vsk->connectTimeout = psk->connectTimeout;
  167.     } else {
  168.        vsk->trusted = capable(CAP_NET_ADMIN);
  169. -      vsk->owner = current_uid();
  170. +      vsk->owner = from_kuid(&init_user_ns, current_uid()),
  171.        vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE;
  172.        vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN;
  173.        vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX;
  174. diff -pur a/vsock-only/shared/vm_assert.h b/vsock-only/shared/vm_assert.h
  175. --- a/vsock-only/shared/vm_assert.h 2014-04-15 01:41:41.000000000 +0400
  176. +++ b/vsock-only/shared/vm_assert.h 2014-04-30 03:30:42.534585000 +0400
  177. @@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
  178.                                         __FILE__, __LINE__, __FUNCTION__, \
  179.                                         _fix))
  180.  #else
  181. +   #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
  182.     #define DEPRECATED(_fix) do {} while (0)
  183.  #endif
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!