Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

userns: Convert hfs to use kuid and kgid where appropriate

Browse source 
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-07 16:26:59 -08:00
parent d001b05365
commit 43b5e4ccd4
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/hfs/hfs_fs.h
View file

@ -134,8 +134,8 @@ struct hfs_sb_info {
permissions on all files */ permissions on all files */
umode_t s_dir_umask; /* The umask applied to the umode_t s_dir_umask; /* The umask applied to the
permissions on all dirs */ permissions on all dirs */
uid_t s_uid; /* The uid of all files */ kuid_t s_uid; /* The uid of all files */
gid_t s_gid; /* The gid of all files */ kgid_t s_gid; /* The gid of all files */
int session, part; int session, part;
struct nls_table *nls_io, *nls_disk; struct nls_table *nls_io, *nls_disk;

4
fs/hfs/inode.c
View file

@ -594,9 +594,9 @@ int hfs_inode_setattr(struct dentry *dentry, struct iattr * attr)
/* no uig/gid changes and limit which mode bits can be set */ /* no uig/gid changes and limit which mode bits can be set */
if (((attr->ia_valid & ATTR_UID) && if (((attr->ia_valid & ATTR_UID) &&
(attr->ia_uid != hsb->s_uid)) || (!uid_eq(attr->ia_uid, hsb->s_uid))) ||
((attr->ia_valid & ATTR_GID) && ((attr->ia_valid & ATTR_GID) &&
(attr->ia_gid != hsb->s_gid)) || (!gid_eq(attr->ia_gid, hsb->s_gid))) ||
((attr->ia_valid & ATTR_MODE) && ((attr->ia_valid & ATTR_MODE) &&
((S_ISDIR(inode->i_mode) && ((S_ISDIR(inode->i_mode) &&
(attr->ia_mode != inode->i_mode)) || (attr->ia_mode != inode->i_mode)) ||

16
fs/hfs/super.c
View file

@ -138,7 +138,9 @@ static int hfs_show_options(struct seq_file *seq, struct dentry *root)
seq_printf(seq, ",creator=%.4s", (char *)&sbi->s_creator); seq_printf(seq, ",creator=%.4s", (char *)&sbi->s_creator);
if (sbi->s_type != cpu_to_be32(0x3f3f3f3f)) if (sbi->s_type != cpu_to_be32(0x3f3f3f3f))
seq_printf(seq, ",type=%.4s", (char *)&sbi->s_type); seq_printf(seq, ",type=%.4s", (char *)&sbi->s_type);
seq_printf(seq, ",uid=%u,gid=%u", sbi->s_uid, sbi->s_gid); seq_printf(seq, ",uid=%u,gid=%u",
from_kuid_munged(&init_user_ns, sbi->s_uid),
from_kgid_munged(&init_user_ns, sbi->s_gid));
if (sbi->s_file_umask != 0133) if (sbi->s_file_umask != 0133)
seq_printf(seq, ",file_umask=%o", sbi->s_file_umask); seq_printf(seq, ",file_umask=%o", sbi->s_file_umask);
if (sbi->s_dir_umask != 0022) if (sbi->s_dir_umask != 0022)
@ -254,14 +256,22 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
printk(KERN_ERR "hfs: uid requires an argument\n"); printk(KERN_ERR "hfs: uid requires an argument\n");
return 0; return 0;
} }
hsb->s_uid = (uid_t)tmp; hsb->s_uid = make_kuid(current_user_ns(), (uid_t)tmp);
if (!uid_valid(hsb->s_uid)) {
printk(KERN_ERR "hfs: invalid uid %d\n", tmp);
return 0;
}
break; break;
case opt_gid: case opt_gid:
if (match_int(&args[0], &tmp)) { if (match_int(&args[0], &tmp)) {
printk(KERN_ERR "hfs: gid requires an argument\n"); printk(KERN_ERR "hfs: gid requires an argument\n");
return 0; return 0;
} }
hsb->s_gid = (gid_t)tmp; hsb->s_gid = make_kgid(current_user_ns(), (gid_t)tmp);
if (!gid_valid(hsb->s_gid)) {
printk(KERN_ERR "hfs: invalid gid %d\n", tmp);
return 0;
}
break; break;
case opt_umask: case opt_umask:
if (match_octal(&args[0], &tmp)) { if (match_octal(&args[0], &tmp)) {

1
init/Kconfig
View file

@ -943,7 +943,6 @@ config UIDGID_CONVERTED
depends on CODA_FS = n depends on CODA_FS = n
depends on FUSE_FS = n depends on FUSE_FS = n
depends on GFS2_FS = n depends on GFS2_FS = n
depends on HFS_FS = n
depends on HFSPLUS_FS = n depends on HFSPLUS_FS = n
depends on HPFS_FS = n depends on HPFS_FS = n
depends on ISO9660_FS = n depends on ISO9660_FS = n