userns: Convert hfs to use kuid and kgid where appropriate (43b5e4cc) · Commits · e / devices / android_kernel_xiaomi_nabu

fs/hfs/hfs_fs.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -134,8 +134,8 @@ struct hfs_sb_info {
		permissions on all files */
		umode_t s_dir_umask; /* The umask applied to the
		permissions on all dirs */
		uid_t s_uid; /* The uid of all files */
		gid_t s_gid; /* The gid of all files */
		kuid_t s_uid; /* The uid of all files */
		kgid_t s_gid; /* The gid of all files */

		int session, part;
		struct nls_table nls_io, nls_disk;

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 */
		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_gid != hsb->s_gid)) \|\|
		(!gid_eq(attr->ia_gid, hsb->s_gid))) \|\|
		((attr->ia_valid & ATTR_MODE) &&
		((S_ISDIR(inode->i_mode) &&
		(attr->ia_mode != inode->i_mode)) \|\|

+13 −3

Original line number	Diff line number	Diff line
		@@ -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);
		if (sbi->s_type != cpu_to_be32(0x3f3f3f3f))
		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)
		seq_printf(seq, ",file_umask=%o", sbi->s_file_umask);
		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");
		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;
		case opt_gid:
		if (match_int(&args[0], &tmp)) {
		printk(KERN_ERR "hfs: gid requires an argument\n");
		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;
		case opt_umask:
		if (match_octal(&args[0], &tmp)) {

+0 −1