userns: Convert adfs to use kuid and kgid where appropriate

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h
index 718ac1f440c6729c334b800375d853a5bd107366..585adafb0cc270f9e0b023b2543e1151fa83e3b4 100644 (file)
--- a/fs/adfs/adfs.h
+++ b/fs/adfs/adfs.h
@@ -46,8 +46,8 @@ struct adfs_sb_info {
        struct adfs_discmap *s_map;     /* bh list containing map                */
        struct adfs_dir_ops *s_dir;     /* directory operations                  */
 
-       uid_t           s_uid;          /* owner uid                             */
-       gid_t           s_gid;          /* owner gid                             */
+       kuid_t          s_uid;          /* owner uid                             */
+       kgid_t          s_gid;          /* owner gid                             */
        umode_t         s_owner_mask;   /* ADFS owner perm -> unix perm          */
        umode_t         s_other_mask;   /* ADFS other perm -> unix perm          */
        int             s_ftsuffix;     /* ,xyz hex filetype suffix option */

diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c
index 1dab6a174d6a8c213d6b58bed1f1869ed6189cd4..e9bad5093a3f92f45761a534e38cae37661fddea 100644 (file)
--- a/fs/adfs/inode.c
+++ b/fs/adfs/inode.c
@@ -304,8 +304,8 @@ adfs_notify_change(struct dentry *dentry, struct iattr *attr)
         * we can't change the UID or GID of any file -
         * we have a global UID/GID in the superblock
         */
-       if ((ia_valid & ATTR_UID && attr->ia_uid != ADFS_SB(sb)->s_uid) ||
-           (ia_valid & ATTR_GID && attr->ia_gid != ADFS_SB(sb)->s_gid))
+       if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, ADFS_SB(sb)->s_uid)) ||
+           (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, ADFS_SB(sb)->s_gid)))
                error = -EPERM;
 
        if (error)

diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index bdaec92353c2cc0e5e876115ee7a474e45c0ba4b..22a0d7ed5fa1c45bf412d42346f7c003c929185a 100644 (file)
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -15,6 +15,7 @@
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/statfs.h>
+#include <linux/user_namespace.h>
 #include "adfs.h"
 #include "dir_f.h"
 #include "dir_fplus.h"
@@ -130,10 +131,10 @@ static int adfs_show_options(struct seq_file *seq, struct dentry *root)
 {
        struct adfs_sb_info *asb = ADFS_SB(root->d_sb);
 
-       if (asb->s_uid != 0)
-               seq_printf(seq, ",uid=%u", asb->s_uid);
-       if (asb->s_gid != 0)
-               seq_printf(seq, ",gid=%u", asb->s_gid);
+       if (!uid_eq(asb->s_uid, GLOBAL_ROOT_UID))
+               seq_printf(seq, ",uid=%u", from_kuid_munged(&init_user_ns, asb->s_uid));
+       if (!gid_eq(asb->s_gid, GLOBAL_ROOT_GID))
+               seq_printf(seq, ",gid=%u", from_kgid_munged(&init_user_ns, asb->s_gid));
        if (asb->s_owner_mask != ADFS_DEFAULT_OWNER_MASK)
                seq_printf(seq, ",ownmask=%o", asb->s_owner_mask);
        if (asb->s_other_mask != ADFS_DEFAULT_OTHER_MASK)
@@ -175,12 +176,16 @@ static int parse_options(struct super_block *sb, char *options)
                case Opt_uid:
                        if (match_int(args, &option))
                                return -EINVAL;
-                       asb->s_uid = option;
+                       asb->s_uid = make_kuid(current_user_ns(), option);
+                       if (!uid_valid(asb->s_uid))
+                               return -EINVAL;
                        break;
                case Opt_gid:
                        if (match_int(args, &option))
                                return -EINVAL;
-                       asb->s_gid = option;
+                       asb->s_gid = make_kgid(current_user_ns(), option);
+                       if (!gid_valid(asb->s_gid))
+                               return -EINVAL;
                        break;
                case Opt_ownmask:
                        if (match_octal(args, &option))
@@ -369,8 +374,8 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
        sb->s_fs_info = asb;
 
        /* set default options */
-       asb->s_uid = 0;
-       asb->s_gid = 0;
+       asb->s_uid = GLOBAL_ROOT_UID;
+       asb->s_gid = GLOBAL_ROOT_GID;
        asb->s_owner_mask = ADFS_DEFAULT_OWNER_MASK;
        asb->s_other_mask = ADFS_DEFAULT_OTHER_MASK;
        asb->s_ftsuffix = 0;

diff --git a/init/Kconfig b/init/Kconfig
index 485c60ae2aed415d21f112c0c87c2ba65259b7ca..20ddf0d7dec0a60c41fe7dcb36f6b07efc51793b 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -933,7 +933,6 @@ config UIDGID_CONVERTED
 
        # Filesystems
        depends on 9P_FS = n
-       depends on ADFS_FS = n
        depends on AFFS_FS = n
        depends on AFS_FS = n
        depends on AUTOFS4_FS = n