diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-10 12:14:27 -0800 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-21 03:13:35 -0700 |
| commit | 61293ee2749bc2414725da37e50308154ff91574 (patch) | |
| tree | 27881ed8244a4e8cdebdc5b19c94e9a45901d341 /fs/squashfs | |
| parent | df814654f364369dfb2fe3c870f3544ce69aa78c (diff) | |
| download | linux-stable-61293ee2749bc2414725da37e50308154ff91574.tar.gz linux-stable-61293ee2749bc2414725da37e50308154ff91574.tar.bz2 linux-stable-61293ee2749bc2414725da37e50308154ff91574.zip | |
userns: Convert squashfs to use kuid/kgid where appropriate
Cc: Phillip Lougher <phillip@squashfs.org.uk>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs/squashfs')
| -rw-r--r-- | fs/squashfs/inode.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c index 81afbccfa843..a1ce5ce60632 100644 --- a/fs/squashfs/inode.c +++ b/fs/squashfs/inode.c @@ -56,16 +56,20 @@ static int squashfs_new_inode(struct super_block *sb, struct inode *inode, struct squashfs_base_inode *sqsh_ino) { + uid_t i_uid; + gid_t i_gid; 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) 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) 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_mtime.tv_sec = le32_to_cpu(sqsh_ino->mtime); inode->i_atime.tv_sec = inode->i_mtime.tv_sec; |