Merge branch 'linux-next' of git://git.open-osd.org/linux-open-osd

[~andy/linux] / fs / debugfs / inode.c

diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index 6393fd61d5c4dedc19574cdee6eb136d1340fddb..b607d92cdf2445ab8c1e364a70f939ce21e22c6a 100644 (file)
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -128,8 +128,8 @@ static inline int debugfs_positive(struct dentry *dentry)
 }
 
 struct debugfs_mount_opts {
-       uid_t uid;
-       gid_t gid;
+       kuid_t uid;
+       kgid_t gid;
        umode_t mode;
 };
 
@@ -156,6 +156,8 @@ static int debugfs_parse_options(char *data, struct debugfs_mount_opts *opts)
        substring_t args[MAX_OPT_ARGS];
        int option;
        int token;
+       kuid_t uid;
+       kgid_t gid;
        char *p;
 
        opts->mode = DEBUGFS_DEFAULT_MODE;
@@ -169,12 +171,18 @@ static int debugfs_parse_options(char *data, struct debugfs_mount_opts *opts)
                case Opt_uid:
                        if (match_int(&args[0], &option))
                                return -EINVAL;
-                       opts->uid = option;
+                       uid = make_kuid(current_user_ns(), option);
+                       if (!uid_valid(uid))
+                               return -EINVAL;
+                       opts->uid = uid;
                        break;
                case Opt_gid:
                        if (match_octal(&args[0], &option))
                                return -EINVAL;
-                       opts->gid = option;
+                       gid = make_kgid(current_user_ns(), option);
+                       if (!gid_valid(gid))
+                               return -EINVAL;
+                       opts->gid = gid;
                        break;
                case Opt_mode:
                        if (match_octal(&args[0], &option))
@@ -226,10 +234,12 @@ static int debugfs_show_options(struct seq_file *m, struct dentry *root)
        struct debugfs_fs_info *fsi = root->d_sb->s_fs_info;
        struct debugfs_mount_opts *opts = &fsi->mount_opts;
 
-       if (opts->uid != 0)
-               seq_printf(m, ",uid=%u", opts->uid);
-       if (opts->gid != 0)
-               seq_printf(m, ",gid=%u", opts->gid);
+       if (!uid_eq(opts->uid, GLOBAL_ROOT_UID))
+               seq_printf(m, ",uid=%u",
+                          from_kuid_munged(&init_user_ns, opts->uid));
+       if (!gid_eq(opts->gid, GLOBAL_ROOT_GID))
+               seq_printf(m, ",gid=%u",
+                          from_kgid_munged(&init_user_ns, opts->gid));
        if (opts->mode != DEBUGFS_DEFAULT_MODE)
                seq_printf(m, ",mode=%o", opts->mode);