|
Line
Link Here
|
| 0 |
-- a/vmblock-only/linux/inode.c 2013-03-20 17:37:48.000000000 +0100 |
0 |
++ b/vmblock-only/linux/inode.c 2013-03-20 17:41:22.000000000 +0100 |
|
Lines 135-141
Link Here
|
| 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 |
|
141 |
|
| 141 |
d_add(dentry, inode); |
142 |
d_add(dentry, inode); |
| 142 |
-- a/vmci-only/linux/driver.c 2013-03-20 17:57:35.000000000 +0100 |
143 |
++ b/vmci-only/linux/driver.c 2013-03-20 17:57:43.000000000 +0100 |
|
Lines 740-746
Link Here
|
| 740 |
goto init_release; |
740 |
goto init_release; |
| 741 |
} |
741 |
} |
| 742 |
|
742 |
|
| 743 |
user = current_uid(); |
743 |
user = from_kuid(current_user_ns(), current_uid()); |
| 744 |
retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags, |
744 |
retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags, |
| 745 |
0 /* Unused */, vmciLinux->userVersion, |
745 |
0 /* Unused */, vmciLinux->userVersion, |
| 746 |
&user, &vmciLinux->context); |
746 |
&user, &vmciLinux->context); |
| 747 |
-- a/vsock-only/linux/af_vsock.c 2013-03-20 18:01:48.000000000 +0100 |
747 |
++ b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.000000000 +0100 |
|
Lines 2866-2872
Link Here
|
| 2866 |
vsk->connectTimeout = psk->connectTimeout; |
2866 |
vsk->connectTimeout = psk->connectTimeout; |
| 2867 |
} else { |
2867 |
} else { |
| 2868 |
vsk->trusted = capable(CAP_NET_ADMIN); |
2868 |
vsk->trusted = capable(CAP_NET_ADMIN); |
| 2869 |
vsk->owner = current_uid(); |
2869 |
vsk->owner = from_kuid(current_user_ns(), current_uid()); |
| 2870 |
vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE; |
2870 |
vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE; |
| 2871 |
vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN; |
2871 |
vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN; |
| 2872 |
vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX; |
2872 |
vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX; |
