Attachment #384100 for bug #521872

Lines 135-141 InodeOpLookup(struct inode *dir, // Link Here

(-)a/vmblock-only/linux/inode.c (-1 / +2 lines)
135	inode->i_size = INODE_TO_IINFO(inode)->nameLen;	135	inode->i_size = INODE_TO_IINFO(inode)->nameLen;
136	inode->i_version = 1;	136	inode->i_version = 1;
137	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;	137	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
138	inode->i_uid = inode->i_gid = 0;	138	inode->i_uid = GLOBAL_ROOT_UID;
		139	inode->i_gid = GLOBAL_ROOT_GID;
139	inode->i_op = &LinkInodeOps;	140	inode->i_op = &LinkInodeOps;
140	d_add(dentry, inode);	141	d_add(dentry, inode);

Lines 256-261 void WarningThrottled(uint32 *count, con Link Here

(-)a/vmblock-only/shared/vm_assert.h (+1 lines)
256	__FILE__, __LINE__, __FUNCTION__, \	256	__FILE__, __LINE__, __FUNCTION__, \
257	_fix))	257	_fix))
258	#else	258	#else
		259	#undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
259	#define DEPRECATED(_fix) do {} while (0)	260	#define DEPRECATED(_fix) do {} while (0)
260	#endif	261	#endif

Lines 737-743 LinuxDriver_Ioctl(struct inode *inode, Link Here

(-)a/vmci-only/linux/driver.c (-1 / +1 lines)
737	goto init_release;	737	goto init_release;
738	}	738	}
739	user = current_uid();	739	user = from_kuid(current_user_ns(), current_uid());
740	retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,	740	retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,
741	0 /* Unused */, vmciLinux->userVersion,	741	0 /* Unused */, vmciLinux->userVersion,
742	&user, &vmciLinux->context);	742	&user, &vmciLinux->context);

Lines 256-261 void WarningThrottled(uint32 *count, con Link Here

(-)a/vmci-only/shared/vm_assert.h (+1 lines)
256	__FILE__, __LINE__, __FUNCTION__, \	256	__FILE__, __LINE__, __FUNCTION__, \
257	_fix))	257	_fix))
258	#else	258	#else
		259	#undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
259	#define DEPRECATED(_fix) do {} while (0)	260	#define DEPRECATED(_fix) do {} while (0)
260	#endif	261	#endif

Lines 256-261 void WarningThrottled(uint32 *count, con Link Here

(-)a/vmmon-only/include/vm_assert.h (+1 lines)
256	__FILE__, __LINE__, __FUNCTION__, \	256	__FILE__, __LINE__, __FUNCTION__, \
257	_fix))	257	_fix))
258	#else	258	#else
		259	#undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
259	#define DEPRECATED(_fix) do {} while (0)	260	#define DEPRECATED(_fix) do {} while (0)
260	#endif	261	#endif

Lines 1338-1344 LinuxDriverReadTSC(void *data, // OUT: Link Here

(-)a/vmmon-only/linux/driver.c (-1 / +3 lines)
1338	*-----------------------------------------------------------------------------	1338	*-----------------------------------------------------------------------------
1339	*/	1339	*/
1340	__attribute__((always_inline)) static Bool	1340	#include <linux/compiler-gcc.h>
		1341
		1342	__always_inline static Bool
1341	LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min	1343	LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
1342	{	1344	{
1343	TSCDelta tscDelta;	1345	TSCDelta tscDelta;

Lines 256-261 void WarningThrottled(uint32 *count, con Link Here

(-)a/vmnet-only/vm_assert.h (+1 lines)
256	__FILE__, __LINE__, __FUNCTION__, \	256	__FILE__, __LINE__, __FUNCTION__, \
257	_fix))	257	_fix))
258	#else	258	#else
		259	#undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
259	#define DEPRECATED(_fix) do {} while (0)	260	#define DEPRECATED(_fix) do {} while (0)
260	#endif	261	#endif

Lines 2869-2875 __VSockVmciCreate(struct net *net, Link Here

(-)a/vsock-only/linux/af_vsock.c (-1 / +1 lines)
2869	vsk->connectTimeout = psk->connectTimeout;	2869	vsk->connectTimeout = psk->connectTimeout;
2870	} else {	2870	} else {
2871	vsk->trusted = capable(CAP_NET_ADMIN);	2871	vsk->trusted = capable(CAP_NET_ADMIN);
2872	vsk->owner = current_uid();	2872	vsk->owner = from_kuid(current_user_ns(), current_uid());
2873	vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE;	2873	vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE;
2874	vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN;	2874	vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN;
2875	vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX;	2875	vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX;

Lines 256-261 void WarningThrottled(uint32 *count, con Link Here

(-)a/vsock-only/shared/vm_assert.h (+1 lines)
256	__FILE__, __LINE__, __FUNCTION__, \	256	__FILE__, __LINE__, __FUNCTION__, \
257	_fix))	257	_fix))
258	#else	258	#else
		259	#undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
259	#define DEPRECATED(_fix) do {} while (0)	260	#define DEPRECATED(_fix) do {} while (0)
260	#endif	261	#endif

Return to bug 521872