OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

userns: Convert isofs to use kuid/kgid where appropriate 

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2012-02-10 11:35:50 -08:00
parent 16525e3f14
commit ba64e2b9e3
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/isofs/inode.c
View File

@ -21,6 +21,7 @@
#include <linux/cdrom.h> #include <linux/cdrom.h>
#include <linux/parser.h> #include <linux/parser.h>
#include <linux/mpage.h> #include <linux/mpage.h>
#include <linux/user_namespace.h>
#include "isofs.h" #include "isofs.h"
#include "zisofs.h" #include "zisofs.h"
@ -171,8 +172,8 @@ struct iso9660_options{
unsigned int blocksize; unsigned int blocksize;
umode_t fmode; umode_t fmode;
umode_t dmode; umode_t dmode;
gid_t gid; kgid_t gid;
uid_t uid; kuid_t uid;
char *iocharset; char *iocharset;
/* LVE */ /* LVE */
s32 session; s32 session;
@ -383,8 +384,8 @@ static int parse_options(char *options, struct iso9660_options *popt)
popt->fmode = popt->dmode = ISOFS_INVALID_MODE; popt->fmode = popt->dmode = ISOFS_INVALID_MODE;
popt->uid_set = 0; popt->uid_set = 0;
popt->gid_set = 0; popt->gid_set = 0;
popt->gid = 0; popt->gid = GLOBAL_ROOT_GID;
popt->uid = 0; popt->uid = GLOBAL_ROOT_UID;
popt->iocharset = NULL; popt->iocharset = NULL;
popt->utf8 = 0; popt->utf8 = 0;
popt->overriderockperm = 0; popt->overriderockperm = 0;
@ -460,13 +461,17 @@ static int parse_options(char *options, struct iso9660_options *popt)
case Opt_uid: case Opt_uid:
if (match_int(&args[0], &option)) if (match_int(&args[0], &option))
return 0; return 0;
popt->uid = option; popt->uid = make_kuid(current_user_ns(), option);
if (!uid_valid(popt->uid))
return 0;
popt->uid_set = 1; popt->uid_set = 1;
break; break;
case Opt_gid: case Opt_gid:
if (match_int(&args[0], &option)) if (match_int(&args[0], &option))
return 0; return 0;
popt->gid = option; popt->gid = make_kgid(current_user_ns(), option);
if (!gid_valid(popt->gid))
return 0;
popt->gid_set = 1; popt->gid_set = 1;
break; break;
case Opt_mode: case Opt_mode:

4
fs/isofs/isofs.h
View File

@ -52,8 +52,8 @@ struct isofs_sb_info {
umode_t s_fmode; umode_t s_fmode;
umode_t s_dmode; umode_t s_dmode;
gid_t s_gid; kgid_t s_gid;
uid_t s_uid; kuid_t s_uid;
struct nls_table *s_nls_iocharset; /* Native language support table */ struct nls_table *s_nls_iocharset; /* Native language support table */
}; };

4
fs/isofs/rock.c
View File

@ -364,8 +364,8 @@ repeat:
case SIG('P', 'X'): case SIG('P', 'X'):
inode->i_mode = isonum_733(rr->u.PX.mode); inode->i_mode = isonum_733(rr->u.PX.mode);
set_nlink(inode, isonum_733(rr->u.PX.n_links)); set_nlink(inode, isonum_733(rr->u.PX.n_links));
inode->i_uid = isonum_733(rr->u.PX.uid); i_uid_write(inode, isonum_733(rr->u.PX.uid));
inode->i_gid = isonum_733(rr->u.PX.gid); i_gid_write(inode, isonum_733(rr->u.PX.gid));
break; break;
case SIG('P', 'N'): case SIG('P', 'N'):
{ {

1
init/Kconfig
View File

@ -944,7 +944,6 @@ config UIDGID_CONVERTED
depends on FUSE_FS = n depends on FUSE_FS = n
depends on GFS2_FS = n depends on GFS2_FS = n
depends on HPFS_FS = n depends on HPFS_FS = n
depends on ISO9660_FS = n
depends on JFFS2_FS = n depends on JFFS2_FS = n
depends on JFS_FS = n depends on JFS_FS = n
depends on LOGFS = n depends on LOGFS = n