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

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

userns: Convert isofs to use kuid/kgid where appropriate 



Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 16525e3f

fs/isofs/inode.c

+11 −6
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/cdrom.h>

#include <linux/parser.h>

#include <linux/mpage.h>

#include <linux/user_namespace.h>



#include "isofs.h"

#include "zisofs.h"
@@ -171,8 +172,8 @@ struct iso9660_options{ 
	unsigned int blocksize;

	umode_t fmode;

	umode_t dmode;

	gid_t gid;

	uid_t uid;

	kgid_t gid;

	kuid_t uid;

	char *iocharset;

	/* LVE */

	s32 session;
@@ -383,8 +384,8 @@ static int parse_options(char *options, struct iso9660_options *popt) 
	popt->fmode = popt->dmode = ISOFS_INVALID_MODE;

	popt->uid_set = 0;

	popt->gid_set = 0;

	popt->gid = 0;

	popt->uid = 0;

	popt->gid = GLOBAL_ROOT_GID;

	popt->uid = GLOBAL_ROOT_UID;

	popt->iocharset = NULL;

	popt->utf8 = 0;

	popt->overriderockperm = 0;
@@ -460,13 +461,17 @@ static int parse_options(char *options, struct iso9660_options *popt) 
		case Opt_uid:

			if (match_int(&args[0], &option))

				return 0;

			popt->uid = option;

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

			if (!uid_valid(popt->uid))

				return 0;

			popt->uid_set = 1;

			break;

		case Opt_gid:

			if (match_int(&args[0], &option))

				return 0;

			popt->gid = option;

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

			if (!gid_valid(popt->gid))

				return 0;

			popt->gid_set = 1;

			break;

		case Opt_mode:

fs/isofs/isofs.h

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ struct isofs_sb_info { 


	umode_t s_fmode;

	umode_t s_dmode;

	gid_t s_gid;

	uid_t s_uid;

	kgid_t s_gid;

	kuid_t s_uid;

	struct nls_table *s_nls_iocharset; /* Native language support table */

};

fs/isofs/rock.c

+2 −2
Original line number Diff line number Diff line
@@ -364,8 +364,8 @@ repeat: 
		case SIG('P', 'X'):

			inode->i_mode = isonum_733(rr->u.PX.mode);

			set_nlink(inode, isonum_733(rr->u.PX.n_links));

			inode->i_uid = isonum_733(rr->u.PX.uid);

			inode->i_gid = isonum_733(rr->u.PX.gid);

			i_uid_write(inode, isonum_733(rr->u.PX.uid));

			i_gid_write(inode, isonum_733(rr->u.PX.gid));

			break;

		case SIG('P', 'N'):

			{

init/Kconfig

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

	depends on GFS2_FS = n

	depends on HPFS_FS = n

	depends on ISO9660_FS = n

	depends on JFFS2_FS = n

	depends on JFS_FS = n

	depends on LOGFS = n