Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -rupN a/vmblock-only/linux/inode.c b/vmblock-only/linux/inode.c
- --- a/vmblock-only/linux/inode.c 2014-03-31 18:49:14.843009422 +0100
- +++ b/vmblock-only/linux/inode.c 2014-03-31 18:50:52.617009677 +0100
- @@ -135,7 +135,8 @@ InodeOpLookup(struct inode *dir, //
- inode->i_size = INODE_TO_IINFO(inode)->nameLen;
- inode->i_version = 1;
- inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
- - inode->i_uid = inode->i_gid = 0;
- + inode->i_uid = GLOBAL_ROOT_UID;
- + inode->i_gid = GLOBAL_ROOT_GID;
- inode->i_op = &LinkInodeOps;
- d_add(dentry, inode);
- diff -rupN a/vmblock-only/shared/vm_assert.h b/vmblock-only/shared/vm_assert.h
- --- a/vmblock-only/shared/vm_assert.h 2014-03-31 18:49:14.843009422 +0100
- +++ b/vmblock-only/shared/vm_assert.h 2014-03-31 18:49:21.388009439 +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 a/vmci-only/linux/driver.c b/vmci-only/linux/driver.c
- --- a/vmci-only/linux/driver.c 2014-03-31 18:49:14.840009422 +0100
- +++ b/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 a/vmci-only/shared/vm_assert.h b/vmci-only/shared/vm_assert.h
- --- a/vmci-only/shared/vm_assert.h 2014-03-31 18:49:14.841009422 +0100
- +++ b/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 a/vmmon-only/include/vm_assert.h b/vmmon-only/include/vm_assert.h
- --- a/vmmon-only/include/vm_assert.h 2014-03-31 18:49:14.835009422 +0100
- +++ b/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 a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
- --- a/vmmon-only/linux/driver.c 2014-03-31 18:49:14.834009422 +0100
- +++ b/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 a/vmnet-only/vm_assert.h b/vmnet-only/vm_assert.h
- --- a/vmnet-only/vm_assert.h 2014-03-31 18:49:14.845009422 +0100
- +++ b/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 a/vsock-only/linux/af_vsock.c b/vsock-only/linux/af_vsock.c
- --- a/vsock-only/linux/af_vsock.c 2014-03-31 18:49:14.837009422 +0100
- +++ b/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 a/vsock-only/shared/vm_assert.h b/vsock-only/shared/vm_assert.h
- --- a/vsock-only/shared/vm_assert.h 2014-03-31 18:49:14.839009422 +0100
- +++ b/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
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement