Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2ba138a authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

userns: Convert the udf filesystem to use kuid/kgid where appropriate 



Cc: Jan Kara <jack@suse.cz>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 39241beb

fs/udf/inode.c

+6 −6
Original line number Diff line number Diff line
@@ -1309,14 +1309,14 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) 
	}



	read_lock(&sbi->s_cred_lock);

	inode->i_uid = le32_to_cpu(fe->uid);

	if (inode->i_uid == -1 ||

	i_uid_write(inode, le32_to_cpu(fe->uid));

	if (!uid_valid(inode->i_uid) ||

	    UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_IGNORE) ||

	    UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_SET))

		inode->i_uid = UDF_SB(inode->i_sb)->s_uid;



	inode->i_gid = le32_to_cpu(fe->gid);

	if (inode->i_gid == -1 ||

	i_gid_write(inode, le32_to_cpu(fe->gid));

	if (!gid_valid(inode->i_gid) ||

	    UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_GID_IGNORE) ||

	    UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_GID_SET))

		inode->i_gid = UDF_SB(inode->i_sb)->s_gid;
@@ -1539,12 +1539,12 @@ static int udf_update_inode(struct inode *inode, int do_sync) 
	if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_UID_FORGET))

		fe->uid = cpu_to_le32(-1);

	else

		fe->uid = cpu_to_le32(inode->i_uid);

		fe->uid = cpu_to_le32(i_uid_read(inode));



	if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_GID_FORGET))

		fe->gid = cpu_to_le32(-1);

	else

		fe->gid = cpu_to_le32(inode->i_gid);

		fe->gid = cpu_to_le32(i_gid_read(inode));



	udfperms = ((inode->i_mode & S_IRWXO)) |

		   ((inode->i_mode & S_IRWXG) << 2) |

fs/udf/super.c

+12 −8
Original line number Diff line number Diff line
@@ -199,8 +199,8 @@ struct udf_options { 
	unsigned int rootdir;

	unsigned int flags;

	umode_t umask;

	gid_t gid;

	uid_t uid;

	kgid_t gid;

	kuid_t uid;

	umode_t fmode;

	umode_t dmode;

	struct nls_table *nls_map;
@@ -335,9 +335,9 @@ static int udf_show_options(struct seq_file *seq, struct dentry *root) 
	if (UDF_QUERY_FLAG(sb, UDF_FLAG_GID_IGNORE))

		seq_puts(seq, ",gid=ignore");

	if (UDF_QUERY_FLAG(sb, UDF_FLAG_UID_SET))

		seq_printf(seq, ",uid=%u", sbi->s_uid);

		seq_printf(seq, ",uid=%u", from_kuid(&init_user_ns, sbi->s_uid));

	if (UDF_QUERY_FLAG(sb, UDF_FLAG_GID_SET))

		seq_printf(seq, ",gid=%u", sbi->s_gid);

		seq_printf(seq, ",gid=%u", from_kgid(&init_user_ns, sbi->s_gid));

	if (sbi->s_umask != 0)

		seq_printf(seq, ",umask=%ho", sbi->s_umask);

	if (sbi->s_fmode != UDF_INVALID_MODE)
@@ -516,13 +516,17 @@ static int udf_parse_options(char *options, struct udf_options *uopt, 
		case Opt_gid:

			if (match_int(args, &option))

				return 0;

			uopt->gid = option;

			uopt->gid = make_kgid(current_user_ns(), option);

			if (!gid_valid(uopt->gid))

				return 0;

			uopt->flags |= (1 << UDF_FLAG_GID_SET);

			break;

		case Opt_uid:

			if (match_int(args, &option))

				return 0;

			uopt->uid = option;

			uopt->uid = make_kuid(current_user_ns(), option);

			if (!uid_valid(uopt->uid))

				return 0;

			uopt->flags |= (1 << UDF_FLAG_UID_SET);

			break;

		case Opt_umask:
@@ -1931,8 +1935,8 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent) 
	struct udf_sb_info *sbi;



	uopt.flags = (1 << UDF_FLAG_USE_AD_IN_ICB) | (1 << UDF_FLAG_STRICT);

	uopt.uid = -1;

	uopt.gid = -1;

	uopt.uid = INVALID_UID;

	uopt.gid = INVALID_GID;

	uopt.umask = 0;

	uopt.fmode = UDF_INVALID_MODE;

	uopt.dmode = UDF_INVALID_MODE;

fs/udf/udf_sb.h

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ struct udf_sb_info { 


	/* Default permissions */

	umode_t			s_umask;

	gid_t			s_gid;

	uid_t			s_uid;

	kgid_t			s_gid;

	kuid_t			s_uid;

	umode_t			s_fmode;

	umode_t			s_dmode;

	/* Lock protecting consistency of above permission settings */

init/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -939,7 +939,6 @@ config UIDGID_CONVERTED 
	depends on NFSD = n

	depends on NFS_FS = n

	depends on OCFS2_FS = n

	depends on UDF_FS = n

	depends on UFS_FS = n

	depends on XFS_FS = n