lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

userns: Convert squashfs to use kuid/kgid where appropriate

Browse Source 
Cc: Phillip Lougher <phillip@squashfs.org.uk>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman
2012-02-10 12:14:27 -08:00
parent df814654f3
commit 61293ee274
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/squashfs/inode.c
View File

@@ -56,16 +56,20 @@
static int squashfs_new_inode(struct super_block *sb, struct inode *inode, static int squashfs_new_inode(struct super_block *sb, struct inode *inode,
struct squashfs_base_inode *sqsh_ino) struct squashfs_base_inode *sqsh_ino)
{ {
uid_t i_uid;
gid_t i_gid;
int err; int err;
err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->uid), &inode->i_uid); err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->uid), &i_uid);
if (err) if (err)
return err; return err;
err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->guid), &inode->i_gid); err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->guid), &i_gid);
if (err) if (err)
return err; return err;
i_uid_write(inode, i_uid);
i_gid_write(inode, i_gid);
inode->i_ino = le32_to_cpu(sqsh_ino->inode_number); inode->i_ino = le32_to_cpu(sqsh_ino->inode_number);
inode->i_mtime.tv_sec = le32_to_cpu(sqsh_ino->mtime); inode->i_mtime.tv_sec = le32_to_cpu(sqsh_ino->mtime);
inode->i_atime.tv_sec = inode->i_mtime.tv_sec; inode->i_atime.tv_sec = inode->i_mtime.tv_sec;

1
init/Kconfig
View File

@@ -939,7 +939,6 @@ config UIDGID_CONVERTED
depends on NFSD = n depends on NFSD = n
depends on NFS_FS = n depends on NFS_FS = n
depends on OCFS2_FS = n depends on OCFS2_FS = n
depends on SQUASHFS = n
depends on UBIFS_FS = n depends on UBIFS_FS = n
depends on UDF_FS = n depends on UDF_FS = n
depends on UFS_FS = n depends on UFS_FS = n