ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

userns: Convert s390 hypfs to use kuid and kgid where appropriate

Browse Source 
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman
2012-08-07 03:47:41 -07:00
parent 4a2ebb93bf
commit 6a62a21625
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/s390/hypfs/inode.c
View File

@@ -31,8 +31,8 @@ static struct dentry *hypfs_create_update_file(struct super_block *sb,
struct dentry *dir); struct dentry *dir);
struct hypfs_sb_info { struct hypfs_sb_info {
uid_t uid; /* uid used for files and dirs */ kuid_t uid; /* uid used for files and dirs */
gid_t gid; /* gid used for files and dirs */ kgid_t gid; /* gid used for files and dirs */
struct dentry *update_file; /* file to trigger update */ struct dentry *update_file; /* file to trigger update */
time_t last_update; /* last update time in secs since 1970 */ time_t last_update; /* last update time in secs since 1970 */
struct mutex lock; /* lock to protect update process */ struct mutex lock; /* lock to protect update process */
@@ -229,6 +229,8 @@ static int hypfs_parse_options(char *options, struct super_block *sb)
{ {
char *str; char *str;
substring_t args[MAX_OPT_ARGS]; substring_t args[MAX_OPT_ARGS];
kuid_t uid;
kgid_t gid;
if (!options) if (!options)
return 0; return 0;
@@ -243,12 +245,18 @@ static int hypfs_parse_options(char *options, struct super_block *sb)
case opt_uid: case opt_uid:
if (match_int(&args[0], &option)) if (match_int(&args[0], &option))
return -EINVAL; return -EINVAL;
hypfs_info->uid = option; uid = make_kuid(current_user_ns(), option);
if (!uid_valid(uid))
return -EINVAL;
hypfs_info->uid = uid;
break; break;
case opt_gid: case opt_gid:
if (match_int(&args[0], &option)) if (match_int(&args[0], &option))
return -EINVAL; return -EINVAL;
hypfs_info->gid = option; gid = make_kgid(current_user_ns(), option);
if (!gid_valid(gid))
return -EINVAL;
hypfs_info->gid = gid;
break; break;
case opt_err: case opt_err:
default: default:
@@ -263,8 +271,8 @@ static int hypfs_show_options(struct seq_file *s, struct dentry *root)
{ {
struct hypfs_sb_info *hypfs_info = root->d_sb->s_fs_info; struct hypfs_sb_info *hypfs_info = root->d_sb->s_fs_info;
seq_printf(s, ",uid=%u", hypfs_info->uid); seq_printf(s, ",uid=%u", from_kuid_munged(&init_user_ns, hypfs_info->uid));
seq_printf(s, ",gid=%u", hypfs_info->gid); seq_printf(s, ",gid=%u", from_kgid_munged(&init_user_ns, hypfs_info->gid));
return 0; return 0;
} }