Final userns conversions

From: "Eric W. Biederman" <[email protected]>

Cc Sage Weil <[email protected]>

Acked-by Serge Hallyn <[email protected]>

Signed-off-by Eric W. Biederman <[email protected]>

---
 fs/ceph/caps.c       |   16 ++++++++--------
 fs/ceph/inode.c      |   18 +++++++++---------
 fs/ceph/mds_client.c |    4 ++--
 fs/ceph/super.h      |    4 ++--
 init/Kconfig         |    1 -
 5 files changed, 21 insertions(+), 22 deletions(-)

fs/ceph/caps.c +8 -8

index 3251e9c..ee29cc6 100644
@@ -928,7 +928,7 @@ static int send_cap_msg(struct ceph_mds_session *session,
 			u64 size, u64 max_size,
 			struct timespec *mtime, struct timespec *atime,
 			u64 time_warp_seq,
-			uid_t uid, gid_t gid, umode_t mode,
+			kuid_t uid, kgid_t gid, umode_t mode,
 			u64 xattr_version,
 			struct ceph_buffer *xattrs_buf,
 			u64 follows)

@@ -972,8 +972,8 @@ static int send_cap_msg(struct ceph_mds_session *session,
 		ceph_encode_timespec(&fc->atime, atime);
 	fc->time_warp_seq = cpu_to_le32(time_warp_seq);
 
-	fc->uid = cpu_to_le32(uid);
-	fc->gid = cpu_to_le32(gid);
+	fc->uid = cpu_to_le32(from_kuid(&init_user_ns, uid));
+	fc->gid = cpu_to_le32(from_kgid(&init_user_ns, gid));
 	fc->mode = cpu_to_le32(mode);
 
 	fc->xattr_version = cpu_to_le64(xattr_version);

@@ -1079,8 +1079,8 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
 	struct timespec mtime, atime;
 	int wake = 0;
 	umode_t mode;
-	uid_t uid;
-	gid_t gid;
+	kuid_t uid;
+	kgid_t gid;
 	struct ceph_mds_session *session;
 	u64 xattr_version = 0;
 	struct ceph_buffer *xattr_blob = NULL;

@@ -2353,10 +2353,10 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
 
 	if ((issued & CEPH_CAP_AUTH_EXCL) == 0) {
 		inode->i_mode = le32_to_cpu(grant->mode);
-		inode->i_uid = le32_to_cpu(grant->uid);
-		inode->i_gid = le32_to_cpu(grant->gid);
+		i_uid_write(inode, le32_to_cpu(grant->uid));
+		i_gid_write(inode, le32_to_cpu(grant->gid));
 		dout("%p mode 0%o uid.gid %d.%d\n", inode, inode->i_mode,
-		     inode->i_uid, inode->i_gid);
+		     i_uid_read(inode), i_gid_read(inode));
 	}
 
 	if ((issued & CEPH_CAP_LINK_EXCL) == 0)

fs/ceph/inode.c +9 -9

index ba95eea..195b7fd 100644
@@ -612,10 +612,10 @@ static int fill_inode(struct inode *inode,
 
 	if ((issued & CEPH_CAP_AUTH_EXCL) == 0) {
 		inode->i_mode = le32_to_cpu(info->mode);
-		inode->i_uid = le32_to_cpu(info->uid);
-		inode->i_gid = le32_to_cpu(info->gid);
+		i_uid_write(inode, le32_to_cpu(info->uid));
+		i_gid_write(inode, le32_to_cpu(info->gid));
 		dout("%p mode 0%o uid.gid %d.%d\n", inode, inode->i_mode,
-		     inode->i_uid, inode->i_gid);
+		     i_uid_read(inode), i_gid_read(inode));
 	}
 
 	if ((issued & CEPH_CAP_LINK_EXCL) == 0)

@@ -1562,26 +1562,26 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)
 
 	if (ia_valid & ATTR_UID) {
 		dout("setattr %p uid %d -> %d\n", inode,
-		     inode->i_uid, attr->ia_uid);
+		     i_uid_read(inode), from_kuid(&init_user_ns, attr->ia_uid));
 		if (issued & CEPH_CAP_AUTH_EXCL) {
 			inode->i_uid = attr->ia_uid;
 			dirtied |= CEPH_CAP_AUTH_EXCL;
 		} else if ((issued & CEPH_CAP_AUTH_SHARED) == 0 ||
-			   attr->ia_uid != inode->i_uid) {
-			req->r_args.setattr.uid = cpu_to_le32(attr->ia_uid);
+			   !uid_eq(attr->ia_uid, inode->i_uid)) {
+			req->r_args.setattr.uid = cpu_to_le32(from_kuid(&init_user_ns, attr->ia_uid));
 			mask |= CEPH_SETATTR_UID;
 			release |= CEPH_CAP_AUTH_SHARED;
 		}
 	}
 	if (ia_valid & ATTR_GID) {
 		dout("setattr %p gid %d -> %d\n", inode,
-		     inode->i_gid, attr->ia_gid);
+		     i_gid_read(inode), from_kgid(&init_user_ns, attr->ia_gid));
 		if (issued & CEPH_CAP_AUTH_EXCL) {
 			inode->i_gid = attr->ia_gid;
 			dirtied |= CEPH_CAP_AUTH_EXCL;
 		} else if ((issued & CEPH_CAP_AUTH_SHARED) == 0 ||
-			   attr->ia_gid != inode->i_gid) {
-			req->r_args.setattr.gid = cpu_to_le32(attr->ia_gid);
+			   !gid_eq(attr->ia_gid, inode->i_gid)) {
+			req->r_args.setattr.gid = cpu_to_le32(from_kgid(&init_user_ns, attr->ia_gid));
 			mask |= CEPH_SETATTR_GID;
 			release |= CEPH_CAP_AUTH_SHARED;
 		}

fs/ceph/mds_client.c +2 -2

index 1bcf712..59e45fe 100644
@@ -578,8 +578,8 @@ static void __register_request(struct ceph_mds_client *mdsc,
 	ceph_mdsc_get_request(req);
 	__insert_request(mdsc, req);
 
-	req->r_uid = current_fsuid();
-	req->r_gid = current_fsgid();
+	req->r_uid = from_kuid(&init_user_ns, current_fsuid());
+	req->r_gid = from_kgid(&init_user_ns, current_fsgid());
 
 	if (dir) {
 		struct ceph_inode_info *ci = ceph_inode(dir);

fs/ceph/super.h +2 -2

index 66ebe72..f053bbd 100644
@@ -138,8 +138,8 @@ struct ceph_cap_snap {
 	struct ceph_snap_context *context;
 
 	umode_t mode;
-	uid_t uid;
-	gid_t gid;
+	kuid_t uid;
+	kgid_t gid;
 
 	struct ceph_buffer *xattr_blob;
 	u64 xattr_version;

init/Kconfig +0 -1

index dfa391d..cb2c46a 100644
@@ -999,7 +999,6 @@ config UIDGID_CONVERTED
 	default y
 
 	# Filesystems
-	depends on CEPH_FS = n
 	depends on CIFS = n
 	depends on CODA_FS = n
 	depends on GFS2_FS = n

Signature · 1 line

1.7.5.4

Quoted 5 lines · Eric W. Biederman

From: "Eric W. Biederman" <ebiederm-aS9lmoZGLiVWk0Htik3J/[email protected]>

Cc Sage Weil <[email protected]>

Acked-by Serge Hallyn <[email protected]>

Signed-off-by Eric W. Biederman <ebiederm-aS9lmoZGLiVWk0Htik3J/[email protected]>

Acked-by Sage Weil <[email protected]>

Do you want me to take this via the ceph tree?

From: "Eric W. Biederman" <ebiederm-aS9lmoZGLiVWk0Htik3J/[email protected]>

Cc Sage Weil <[email protected]>

Acked-by Serge Hallyn <[email protected]>

Signed-off-by Eric W. Biederman <ebiederm-aS9lmoZGLiVWk0Htik3J/[email protected]>

---
 fs/ceph/caps.c       |   16 ++++++++--------
 fs/ceph/inode.c      |   18 +++++++++---------
 fs/ceph/mds_client.c |    4 ++--
 fs/ceph/super.h      |    4 ++--
 init/Kconfig         |    1 -
 5 files changed, 21 insertions(+), 22 deletions(-)

fs/ceph/caps.c +8 -8

index 3251e9c..ee29cc6 100644
@@ -928,7 +928,7 @@ static int send_cap_msg(struct ceph_mds_session *session,
 			u64 size, u64 max_size,
 			struct timespec *mtime, struct timespec *atime,
 			u64 time_warp_seq,
-			uid_t uid, gid_t gid, umode_t mode,
+			kuid_t uid, kgid_t gid, umode_t mode,
 			u64 xattr_version,
 			struct ceph_buffer *xattrs_buf,
 			u64 follows)

@@ -972,8 +972,8 @@ static int send_cap_msg(struct ceph_mds_session *session,
 		ceph_encode_timespec(&fc->atime, atime);
 	fc->time_warp_seq = cpu_to_le32(time_warp_seq);
 
-	fc->uid = cpu_to_le32(uid);
-	fc->gid = cpu_to_le32(gid);
+	fc->uid = cpu_to_le32(from_kuid(&init_user_ns, uid));
+	fc->gid = cpu_to_le32(from_kgid(&init_user_ns, gid));
 	fc->mode = cpu_to_le32(mode);
 
 	fc->xattr_version = cpu_to_le64(xattr_version);

@@ -1079,8 +1079,8 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
 	struct timespec mtime, atime;
 	int wake = 0;
 	umode_t mode;
-	uid_t uid;
-	gid_t gid;
+	kuid_t uid;
+	kgid_t gid;
 	struct ceph_mds_session *session;
 	u64 xattr_version = 0;
 	struct ceph_buffer *xattr_blob = NULL;

@@ -2353,10 +2353,10 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
 
 	if ((issued & CEPH_CAP_AUTH_EXCL) == 0) {
 		inode->i_mode = le32_to_cpu(grant->mode);
-		inode->i_uid = le32_to_cpu(grant->uid);
-		inode->i_gid = le32_to_cpu(grant->gid);
+		i_uid_write(inode, le32_to_cpu(grant->uid));
+		i_gid_write(inode, le32_to_cpu(grant->gid));
 		dout("%p mode 0%o uid.gid %d.%d\n", inode, inode->i_mode,
-		     inode->i_uid, inode->i_gid);
+		     i_uid_read(inode), i_gid_read(inode));
 	}
 
 	if ((issued & CEPH_CAP_LINK_EXCL) == 0)

fs/ceph/inode.c +9 -9

index ba95eea..195b7fd 100644
@@ -612,10 +612,10 @@ static int fill_inode(struct inode *inode,
 
 	if ((issued & CEPH_CAP_AUTH_EXCL) == 0) {
 		inode->i_mode = le32_to_cpu(info->mode);
-		inode->i_uid = le32_to_cpu(info->uid);
-		inode->i_gid = le32_to_cpu(info->gid);
+		i_uid_write(inode, le32_to_cpu(info->uid));
+		i_gid_write(inode, le32_to_cpu(info->gid));
 		dout("%p mode 0%o uid.gid %d.%d\n", inode, inode->i_mode,
-		     inode->i_uid, inode->i_gid);
+		     i_uid_read(inode), i_gid_read(inode));
 	}
 
 	if ((issued & CEPH_CAP_LINK_EXCL) == 0)

@@ -1562,26 +1562,26 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)
 
 	if (ia_valid & ATTR_UID) {
 		dout("setattr %p uid %d -> %d\n", inode,
-		     inode->i_uid, attr->ia_uid);
+		     i_uid_read(inode), from_kuid(&init_user_ns, attr->ia_uid));
 		if (issued & CEPH_CAP_AUTH_EXCL) {
 			inode->i_uid = attr->ia_uid;
 			dirtied |= CEPH_CAP_AUTH_EXCL;
 		} else if ((issued & CEPH_CAP_AUTH_SHARED) == 0 ||
-			   attr->ia_uid != inode->i_uid) {
-			req->r_args.setattr.uid = cpu_to_le32(attr->ia_uid);
+			   !uid_eq(attr->ia_uid, inode->i_uid)) {
+			req->r_args.setattr.uid = cpu_to_le32(from_kuid(&init_user_ns, attr->ia_uid));
 			mask |= CEPH_SETATTR_UID;
 			release |= CEPH_CAP_AUTH_SHARED;
 		}
 	}
 	if (ia_valid & ATTR_GID) {
 		dout("setattr %p gid %d -> %d\n", inode,
-		     inode->i_gid, attr->ia_gid);
+		     i_gid_read(inode), from_kgid(&init_user_ns, attr->ia_gid));
 		if (issued & CEPH_CAP_AUTH_EXCL) {
 			inode->i_gid = attr->ia_gid;
 			dirtied |= CEPH_CAP_AUTH_EXCL;
 		} else if ((issued & CEPH_CAP_AUTH_SHARED) == 0 ||
-			   attr->ia_gid != inode->i_gid) {
-			req->r_args.setattr.gid = cpu_to_le32(attr->ia_gid);
+			   !gid_eq(attr->ia_gid, inode->i_gid)) {
+			req->r_args.setattr.gid = cpu_to_le32(from_kgid(&init_user_ns, attr->ia_gid));
 			mask |= CEPH_SETATTR_GID;
 			release |= CEPH_CAP_AUTH_SHARED;
 		}

fs/ceph/mds_client.c +2 -2

index 1bcf712..59e45fe 100644
@@ -578,8 +578,8 @@ static void __register_request(struct ceph_mds_client *mdsc,
 	ceph_mdsc_get_request(req);
 	__insert_request(mdsc, req);
 
-	req->r_uid = current_fsuid();
-	req->r_gid = current_fsgid();
+	req->r_uid = from_kuid(&init_user_ns, current_fsuid());
+	req->r_gid = from_kgid(&init_user_ns, current_fsgid());
 
 	if (dir) {
 		struct ceph_inode_info *ci = ceph_inode(dir);

fs/ceph/super.h +2 -2

index 66ebe72..f053bbd 100644
@@ -138,8 +138,8 @@ struct ceph_cap_snap {
 	struct ceph_snap_context *context;
 
 	umode_t mode;
-	uid_t uid;
-	gid_t gid;
+	kuid_t uid;
+	kgid_t gid;
 
 	struct ceph_buffer *xattr_blob;
 	u64 xattr_version;

init/Kconfig +0 -1

index dfa391d..cb2c46a 100644
@@ -999,7 +999,6 @@ config UIDGID_CONVERTED
 	default y
 
 	# Filesystems
-	depends on CEPH_FS = n
 	depends on CIFS = n
 	depends on CODA_FS = n
 	depends on GFS2_FS = n

Signature · 1 line

1.7.5.4

From: "Eric W. Biederman" <ebiederm-aS9lmoZGLiVWk0Htik3J/[email protected]>

Cc Steve French <[email protected]>

Acked-by Serge Hallyn <[email protected]>

Signed-off-by Eric W. Biederman <ebiederm-aS9lmoZGLiVWk0Htik3J/[email protected]>

---
 fs/cifs/cifs_fs_sb.h  |    8 ++--
 fs/cifs/cifs_spnego.c |    4 +-
 fs/cifs/cifsacl.c     |  115
++++++++++++++++++++++++++++++++++++------------
 fs/cifs/cifsacl.h     |   16 ++++++-
 fs/cifs/cifsfs.c      |   12 +++--
 fs/cifs/cifsglob.h    |   22 +++++-----
 fs/cifs/cifspdu.h     |    2 +
 fs/cifs/cifsproto.h   |    9 ++--
 fs/cifs/cifssmb.c     |   11 ++++-
 fs/cifs/connect.c     |   58 +++++++++++++++++++------
 fs/cifs/dir.c         |   18 ++++----
 fs/cifs/file.c        |    8 ++--
 fs/cifs/inode.c       |   28 ++++++------
 fs/cifs/misc.c        |    2 +-
 init/Kconfig          |    1 -
 15 files changed, 213 insertions(+), 101 deletions(-)

fs/cifs/cifs_fs_sb.h +4 -4

index c865bfd..37e4a72 100644
@@ -55,10 +55,10 @@ struct cifs_sb_info {
        unsigned int wsize;
        unsigned long actimeo; /* attribute cache timeout (jiffies) */
        atomic_t active;
-       uid_t   mnt_uid;
-       gid_t   mnt_gid;
-       uid_t   mnt_backupuid;
-       gid_t   mnt_backupgid;
+       kuid_t  mnt_uid;
+       kgid_t  mnt_gid;
+       kuid_t  mnt_backupuid;
+       kgid_t  mnt_backupgid;
        umode_t mnt_file_mode;
        umode_t mnt_dir_mode;
        unsigned int mnt_cifs_flags;

fs/cifs/cifs_spnego.c +2 -2

index 086f381..014a4c2 100644
@@ -149,10 +149,10 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo)
                goto out;
 
        dp = description + strlen(description);
-       sprintf(dp, ";uid=0x%x", sesInfo->linux_uid);
+       sprintf(dp, ";uid=0x%x", from_kuid_munged(&init_user_ns,
 sesInfo->linux_uid));
 
        dp = description + strlen(description);
-       sprintf(dp, ";creduid=0x%x", sesInfo->cred_uid);
+       sprintf(dp, ";creduid=0x%x", from_kuid_munged(&init_user_ns,
 sesInfo->cred_uid));
 

        if (sesInfo->user_name) {
                dp = description + strlen(description);

fs/cifs/cifsacl.c +49 -0

index fc783e2..0f8b920 100644
@@ -44,6 +44,55 @@ static const struct cifs_sid sid_user = {1, 2 , {0, 0,
 0, 0, 0, 5}, {} };
 
 const struct cred *root_cred;
 
+static inline struct cifs_id kuid_to_cid(kuid_t uid)
+{
+       struct cifs_id cid;
+       cid.type = SIDOWNER;
+       cid.uid = uid;
+       return cid;
+}
+
+static inline struct cifs_id kgid_to_cid(kgid_t gid)
+{
+       struct cifs_id cid;
+       cid.type = SIDGROUP;
+       cid.gid = gid;
+       return cid;
+}
+
+static unsigned long from_cid(struct user_namespace *user_ns, struct
 cifs_id cid)
+{
+       switch (cid.type) {
+       case SIDOWNER:
+               return from_kuid(user_ns, cid.uid);
+       case SIDGROUP:
+               return from_kgid(user_ns, cid.gid);
+       default:
+               BUG();
+       }
+}
+
+static bool cid_lt(struct cifs_id left, struct cifs_id right)
+{
+       if (left.type < right.type)
+               return true;
+       if (left.type > right.type)
+               return false;
+       switch (left.type) {
+       case SIDOWNER:
+               return uid_lt(left.uid, right.uid);
+       case SIDGROUP:
+               return gid_lt(left.gid, right.gid);
+       default:
+               BUG();
+       }
+}
+
+static inline bool cid_gt(struct cifs_id left, struct cifs_id right)
+{
+       return cid_lt(right, left);
+}
+
 static void

shrink_idmap_tree(struct rb_root *root, int nr_to_scan, int *nr_rem,
int *nr_del)

fs/cifs/cifsacl.c +1 -1

@@ -105,7 +154,7 @@ cifs_idmap_shrinker(struct shrinker *shrink, struct
 shrink_control *sc)
 }
 
 static void
-sid_rb_insert(struct rb_root *root, unsigned long cid,
+sid_rb_insert(struct rb_root *root, struct cifs_id cid,
                struct cifs_sid_id **psidid, char *typestr)
 {

        char *strptr;

fs/cifs/cifsacl.c +2 -2

@@ -117,11 +166,11 @@ sid_rb_insert(struct rb_root *root, unsigned long
 cid,
        while (node) {
                lsidid = rb_entry(node, struct cifs_sid_id, rbnode);
                parent = node;
-               if (cid > lsidid->id) {
+               if (cid_gt(cid, lsidid->id)) {
                        linkto = &(node->rb_left);
                        node = node->rb_left;
                }
-               if (cid < lsidid->id) {
+               if (cid_lt(cid, lsidid->id)) {
                        linkto = &(node->rb_right);
                        node = node->rb_right;

                }

fs/cifs/cifsacl.c +4 -4

@@ -133,7 +182,7 @@ sid_rb_insert(struct rb_root *root, unsigned long cid,
 
        sprintf((*psidid)->sidstr, "%s", typestr);
        strptr = (*psidid)->sidstr + strlen((*psidid)->sidstr);
-       sprintf(strptr, "%ld", cid);
+       sprintf(strptr, "%ld", from_cid(&init_user_ns, cid));
 
        clear_bit(SID_ID_PENDING, &(*psidid)->state);
        clear_bit(SID_ID_MAPPED, &(*psidid)->state);

@@ -143,16 +192,16 @@ sid_rb_insert(struct rb_root *root, unsigned long
 cid,
 }
 
 static struct cifs_sid_id *
-sid_rb_search(struct rb_root *root, unsigned long cid)
+sid_rb_search(struct rb_root *root, struct cifs_id cid)
 {
        struct rb_node *node = root->rb_node;
        struct cifs_sid_id *lsidid;
 
        while (node) {
                lsidid = rb_entry(node, struct cifs_sid_id, rbnode);
-               if (cid > lsidid->id)
+               if (cid_gt(cid, lsidid->id))
                        node = node->rb_left;
-               else if (cid < lsidid->id)
+               else if (cid_lt(cid, lsidid->id))
                        node = node->rb_right;
                else /* node found */

                        return lsidid;

fs/cifs/cifsacl.c +3 -3

@@ -292,7 +341,7 @@ sidid_pending_wait(void *unused)
 }
 
 static int
-id_to_sid(unsigned long cid, uint sidtype, struct cifs_sid *ssid)
+id_to_sid(struct cifs_id cid, struct cifs_sid *ssid)
 {
        int rc = 0;
        struct key *sidkey;

@@ -302,10 +351,10 @@ id_to_sid(unsigned long cid, uint sidtype, struct
 cifs_sid *ssid)
        struct rb_root *cidtree;
        spinlock_t *cidlock;
 
-       if (sidtype == SIDOWNER) {
+       if (cid.type == SIDOWNER) {
                cidlock = &siduidlock;
                cidtree = &uidtree;
-       } else if (sidtype == SIDGROUP) {
+       } else if (cid.type == SIDGROUP) {
                cidlock = &sidgidlock;
                cidtree = &gidtree;

        } else

fs/cifs/cifsacl.c +1 -1

@@ -336,7 +385,7 @@ id_to_sid(unsigned long cid, uint sidtype, struct
 cifs_sid *ssid)
                } else {
                        psidid = npsidid;
                        sid_rb_insert(cidtree, cid, &psidid,
-                                       sidtype == SIDOWNER ? "oi:" :
 "gi:");
+                                       cid.type == SIDOWNER ? "oi:" :
 "gi:");

                        ++psidid->refcount;
                        spin_unlock(cidlock);
                }

fs/cifs/cifsacl.c +1 -1

@@ -410,7 +459,7 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct
 cifs_sid *psid,
                struct cifs_fattr *fattr, uint sidtype)
 {
        int rc;
-       unsigned long cid;
+       struct cifs_id cid;
        struct key *idkey;
        const struct cred *saved_cred;

        struct cifs_sid_id *psidid, *npsidid;

fs/cifs/cifsacl.c +0 -1

@@ -418,11 +467,11 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct
 cifs_sid *psid,
        spinlock_t *cidlock;
 
        if (sidtype == SIDOWNER) {
-               cid = cifs_sb->mnt_uid; /* default uid, in case upcall

fails */
+ cid = kuid_to_cid(cifs_sb->mnt_uid); /* default uid, in
case upcall fails */

                cidlock = &siduidlock;
                cidtree = &uidtree;
        } else if (sidtype == SIDGROUP) {

- cid = cifs_sb->mnt_gid; /* default gid, in case upcall
fails */
+ cid = kgid_to_cid(cifs_sb->mnt_gid); /* default gid, in
case upcall fails */

                cidlock = &sidgidlock;
                cidtree = &gidtree;
        } else

fs/cifs/cifsacl.c +1 -1

@@ -471,7 +520,7 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct
 cifs_sid *psid,
         * any fields of the node after a reference is put .
         */
        if (test_bit(SID_ID_MAPPED, &psidid->state)) {
-               cid = psidid->id;
+               //cid = psidid->id;
                psidid->time = jiffies; /* update ts for accessing */
                goto sid_to_id_out;

        }

fs/cifs/cifsacl.c +7 -2

@@ -485,8 +534,13 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct
 cifs_sid *psid,
                if (IS_ERR(idkey))
                        cFYI(1, "%s: Can't map SID to an id", __func__);
                else {
-                       cid = *(unsigned long *)idkey->payload.value;
-                       psidid->id = cid;
+                       u32 id;
+                       id = *(u32 *)idkey->payload.value;
+                       psidid->id.type = sidtype;
+                       if (sidtype == SIDOWNER)
+                               psidid->id.uid = make_kuid(&init_user_ns,
 id);
+                       else
+                               psidid->id.gid = make_kgid(&init_user_ns,
 id);

                        set_bit(SID_ID_MAPPED, &psidid->state);
                        key_put(idkey);
                        kfree(psidid->sidstr);

fs/cifs/cifsacl.c +3 -3

@@ -510,10 +564,10 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct
 cifs_sid *psid,
 
 sid_to_id_out:
        --psidid->refcount; /* decremented without spinlock */
-       if (sidtype == SIDOWNER)
-               fattr->cf_uid = cid;
+       if (cid.type == SIDOWNER)
+               fattr->cf_uid = cid.uid;
        else
-               fattr->cf_gid = cid;
+               fattr->cf_gid = cid.gid;
 
        return 0;

}

fs/cifs/cifsacl.c +3 -2

@@ -537,7 +591,8 @@ init_cifs_idmap(void)
        if (!cred)
                return -ENOMEM;
 
-       keyring = key_alloc(&key_type_keyring, ".cifs_idmap", 0, 0, cred,
+       keyring = key_alloc(&key_type_keyring, ".cifs_idmap",
+                           GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
                            (KEY_POS_ALL & ~KEY_POS_SETATTR) |
                            KEY_USR_VIEW | KEY_USR_READ,
                            KEY_ALLOC_NOT_IN_QUOTA);

@@ -1074,7 +1129,7 @@ static int parse_sec_desc(struct cifs_sb_info
 *cifs_sb,
 
 /* Convert permission bits from mode to equivalent CIFS ACL */
 static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd
 *pnntsd,
-       __u32 secdesclen, __u64 nmode, uid_t uid, gid_t gid, int *aclflag)
+       __u32 secdesclen, __u64 nmode, kuid_t uid, kgid_t gid, int
 *aclflag)

 {
        int rc = 0;
        __u32 dacloffset;

fs/cifs/cifsacl.c +5 -3

@@ -1106,17 +1161,18 @@ static int build_sec_desc(struct cifs_ntsd *pntsd,
 struct cifs_ntsd *pnntsd,
                *aclflag = CIFS_ACL_DACL;
        } else {
                memcpy(pnntsd, pntsd, secdesclen);
-               if (uid != NO_CHANGE_32) { /* chown */
+               if (!uid_eq(uid, NO_CHANGE_UID)) { /* chown */
                        owner_sid_ptr = (struct cifs_sid *)((char *)pnntsd
+
                                        le32_to_cpu(pnntsd->osidoffset));
                        nowner_sid_ptr = kmalloc(sizeof(struct cifs_sid),
 
 GFP_KERNEL);
                        if (!nowner_sid_ptr)
                                return -ENOMEM;
-                       rc = id_to_sid(uid, SIDOWNER, nowner_sid_ptr);
+                       rc = id_to_sid(kuid_to_cid(uid), nowner_sid_ptr);
                        if (rc) {
                                cFYI(1, "%s: Mapping error %d for owner id
 %d",
-                                               __func__, rc, uid);
+                                               __func__, rc,
+                                               from_kuid(&init_user_ns,

uid));
                                kfree(nowner_sid_ptr);
                                return rc;
                        }

fs/cifs/cifsacl.c +5 -3

@@ -1125,17 +1181,18 @@ static int build_sec_desc(struct cifs_ntsd *pntsd,
 struct cifs_ntsd *pnntsd,
                        kfree(nowner_sid_ptr);
                        *aclflag = CIFS_ACL_OWNER;
                }
-               if (gid != NO_CHANGE_32) { /* chgrp */
+               if (!gid_eq(gid, NO_CHANGE_GID)) { /* chgrp */
                        group_sid_ptr = (struct cifs_sid *)((char *)pnntsd
+
                                        le32_to_cpu(pnntsd->gsidoffset));
                        ngroup_sid_ptr = kmalloc(sizeof(struct cifs_sid),
 
 GFP_KERNEL);
                        if (!ngroup_sid_ptr)
                                return -ENOMEM;
-                       rc = id_to_sid(gid, SIDGROUP, ngroup_sid_ptr);
+                       rc = id_to_sid(kgid_to_cid(gid), ngroup_sid_ptr);
                        if (rc) {
                                cFYI(1, "%s: Mapping error %d for group id
 %d",
-                                               __func__, rc, gid);
+                                               __func__, rc,
+                                               from_kgid(&init_user_ns,

gid));
                                kfree(ngroup_sid_ptr);
                                return rc;
                        }

fs/cifs/cifsacl.c +1 -1

@@ -1304,7 +1361,7 @@ cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb,
 struct cifs_fattr *fattr,
 /* Convert mode bits to an ACL so we can update the ACL on the server */
 int
 id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 nmode,
-                       uid_t uid, gid_t gid)
+                       kuid_t uid, kgid_t gid)
 {
        int rc = 0;

int aclflag = CIFS_ACL_DACL; /* default flag to set */

fs/cifs/cifsacl.h +4 -2

index 5c902c7..233c576 100644
@@ -39,8 +39,10 @@
 #define ACCESS_ALLOWED 0
 #define ACCESS_DENIED  1
 
-#define SIDOWNER 1
-#define SIDGROUP 2
+enum sidtype {
+       SIDOWNER = 1,
+       SIDGROUP = 2,
+};
 #define SIDLEN 150 /* S- 1 revision- 6 authorities- max 5 sub authorities
 */
 

#define SID_ID_MAPPED 0

fs/cifs/cifsacl.h +8 -0

@@ -83,9 +85,17 @@ struct cifs_wksid {
        char sidname[SIDNAMELENGTH];
 } __attribute__((packed));
 
+struct cifs_id {
+       enum sidtype type;
+       union {
+               kuid_t uid;
+               kgid_t gid;
+       };
+};
+
 struct cifs_sid_id {
        unsigned int refcount; /* increment with spinlock, decrement

without */

fs/cifs/cifsacl.h +1 -1

-       unsigned long id;
+       struct cifs_id id;
        unsigned long time;
        unsigned long state;
        char *sidstr;

fs/cifs/cifsfs.c +2 -2

index e7931cc..0a4740b 100644
@@ -377,13 +377,13 @@ cifs_show_options(struct seq_file *s, struct dentry
 *root)
                                   (int)(srcaddr->sa_family));
        }
 
-       seq_printf(s, ",uid=%u", cifs_sb->mnt_uid);
+       seq_printf(s, ",uid=%u", from_kuid_munged(&init_user_ns,
 cifs_sb->mnt_uid));
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)
                seq_printf(s, ",forceuid");
        else
                seq_printf(s, ",noforceuid");
 
-       seq_printf(s, ",gid=%u", cifs_sb->mnt_gid);
+       seq_printf(s, ",gid=%u", from_kgid_munged(&init_user_ns,
 cifs_sb->mnt_gid));

        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID)
                seq_printf(s, ",forcegid");
        else

fs/cifs/cifsfs.c +6 -2

@@ -438,9 +438,13 @@ cifs_show_options(struct seq_file *s, struct dentry
 *root)
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
                seq_printf(s, ",noperm");
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID)
-               seq_printf(s, ",backupuid=%u", cifs_sb->mnt_backupuid);
+               seq_printf(s, ",backupuid=%u",
+                          from_kuid_munged(&init_user_ns,
+                                           cifs_sb->mnt_backupuid));
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPGID)
-               seq_printf(s, ",backupgid=%u", cifs_sb->mnt_backupgid);
+               seq_printf(s, ",backupgid=%u",
+                          from_kgid_munged(&init_user_ns,
+                                           cifs_sb->mnt_backupgid));
 
        seq_printf(s, ",rsize=%u", cifs_sb->rsize);

        seq_printf(s, ",wsize=%u", cifs_sb->wsize);

fs/cifs/cifsglob.h +0 -0

index f5af252..97f1683 100644
@@ -400,11 +400,11 @@ struct smb_vol {
        char *iocharset;  /* local code page for mapping to and from

Unicode */

        char source_rfc1001_name[RFC1001_NAME_LEN_WITH_NULL]; /* clnt nb
name */
        char target_rfc1001_name[RFC1001_NAME_LEN_WITH_NULL]; /* srvr nb

name */

fs/cifs/cifsglob.h +5 -5

-       uid_t cred_uid;
-       uid_t linux_uid;
-       gid_t linux_gid;
-       uid_t backupuid;
-       gid_t backupgid;
+       kuid_t cred_uid;
+       kuid_t linux_uid;
+       kgid_t linux_gid;
+       kuid_t backupuid;
+       kgid_t backupgid;
        umode_t file_mode;
        umode_t dir_mode;
        unsigned secFlg;

@@ -703,8 +703,8 @@ struct cifs_ses {
        char *serverNOS;        /* name of network operating system of

server */

        char *serverDomain;     /* security realm of server */
        __u64 Suid;             /* remote smb uid  */
-       uid_t linux_uid;        /* overriding owner of files on the mount

*/

fs/cifs/cifsglob.h +1 -1

-       uid_t cred_uid;         /* owner of credentials */
+       kuid_t linux_uid;       /* overriding owner of files on the mount

*/
+ kuid_t cred_uid; /* owner of credentials */
unsigned int capabilities;
char serverName[SERVER_NAME_LEN_WITH_NULL * 2]; /* BB make bigger
for
TCP names - will ipv6 and sctp addresses
fit? */

fs/cifs/cifsglob.h +2 -2

@@ -838,7 +838,7 @@ struct cifs_tcon {
  */
 struct tcon_link {
        struct rb_node          tl_rbnode;
-       uid_t                   tl_uid;
+       kuid_t                  tl_uid;
        unsigned long           tl_flags;
 #define TCON_LINK_MASTER       0
 #define TCON_LINK_PENDING      1

@@ -931,7 +931,7 @@ struct cifsFileInfo {
        struct list_head tlist; /* pointer to next fid owned by tcon */
        struct list_head flist; /* next fid (file instance) for this inode
 */
        struct cifs_fid_locks *llist;   /* brlocks held by this fid */
-       unsigned int uid;       /* allows finding which FileInfo structure
 */
+       kuid_t uid;             /* allows finding which FileInfo structure
 */

__u32 pid; /* process id who opened file */
struct cifs_fid fid; /* file id from remote */
/* BB add lock scope info here if needed */ ;

fs/cifs/cifsglob.h +2 -2

@@ -1259,8 +1259,8 @@ struct cifs_fattr {
        u64             cf_eof;
        u64             cf_bytes;
        u64             cf_createtime;
-       uid_t           cf_uid;
-       gid_t           cf_gid;
+       kuid_t          cf_uid;
+       kgid_t          cf_gid;
        umode_t         cf_mode;
        dev_t           cf_rdev;
        unsigned int    cf_nlink;

fs/cifs/cifspdu.h +2 -0

index b9d59a9..2ede310 100644
@@ -278,6 +278,8 @@
 
 #define NO_CHANGE_64          0xFFFFFFFFFFFFFFFFULL
 #define NO_CHANGE_32          0xFFFFFFFFUL
+#define NO_CHANGE_UID         INVALID_UID
+#define NO_CHANGE_GID         INVALID_GID
 
 /* IPC$ in ASCII */
 #define CIFS_IPC_RESOURCE "\x49\x50\x43\x24"

fs/cifs/cifsproto.h +3 -2

index 5144e9f..27b268a 100644
@@ -46,7 +46,8 @@ extern void _free_xid(unsigned int);
 ({                                                             \
        unsigned int __xid = _get_xid();                                \
        cFYI(1, "CIFS VFS: in %s as Xid: %u with uid: %d",      \
-            __func__, __xid, current_fsuid());                 \
+            __func__, __xid,                                   \
+            from_kuid(&init_user_ns, current_fsuid()));        \
        __xid;                                                  \
 })
 

@@ -161,7 +162,7 @@ extern int cifs_acl_to_fattr(struct cifs_sb_info
 *cifs_sb,
                              struct cifs_fattr *fattr, struct inode
 *inode,
                              const char *path, const __u16 *pfid);
 extern int id_mode_to_cifs_acl(struct inode *inode, const char *path,
 __u64,
-                                       uid_t, gid_t);
+                                       kuid_t, kgid_t);

extern struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *, struct inode
*,

                                        const char *, u32 *);

extern int set_cifs_acl(struct cifs_ntsd *, __u32, struct inode *,

fs/cifs/cifsproto.h +2 -2

@@ -304,8 +305,8 @@ struct cifs_unix_set_info_args {
        __u64   atime;
        __u64   mtime;
        __u64   mode;
-       __u64   uid;
-       __u64   gid;
+       kuid_t  uid;
+       kgid_t  gid;
        dev_t   device;
 };
 

fs/cifs/cifssmb.c +7 -0

index 76d0d29..6b88d47 100644
@@ -5820,6 +5820,13 @@ cifs_fill_unix_set_info(FILE_UNIX_BASIC_INFO
 *data_offset,
                        const struct cifs_unix_set_info_args *args)
 {
        u64 mode = args->mode;
+       __u64 uid;
+       __u64 gid;
+
+       uid = uid_eq(args->uid, NO_CHANGE_UID) ? NO_CHANGE_64:
+               (__u64)from_kuid(&init_user_ns, args->uid);
+       gid = gid_eq(args->gid, NO_CHANGE_GID) ? NO_CHANGE_64:
+               (__u64)from_kgid(&init_user_ns, args->gid);
 
        /*

* Samba server ignores set of file size to zero due to bugs in
some

fs/cifs/cifssmb.c +2 -2

@@ -5833,8 +5840,8 @@ cifs_fill_unix_set_info(FILE_UNIX_BASIC_INFO
 *data_offset,
        data_offset->LastStatusChange = cpu_to_le64(args->ctime);
        data_offset->LastAccessTime = cpu_to_le64(args->atime);
        data_offset->LastModificationTime = cpu_to_le64(args->mtime);
-       data_offset->Uid = cpu_to_le64(args->uid);
-       data_offset->Gid = cpu_to_le64(args->gid);
+       data_offset->Uid = cpu_to_le64(uid);
+       data_offset->Gid = cpu_to_le64(gid);
        /* better to leave device as zero when it is  */
        data_offset->DevMajor = cpu_to_le64(MAJOR(args->device));

        data_offset->DevMinor = cpu_to_le64(MINOR(args->device));

fs/cifs/connect.c +2 -0

index 5c670b9..dab3cf1 100644
@@ -1108,6 +1108,8 @@ cifs_parse_mount_options(const char *mountdata,
 const char *devname,
        char *string = NULL;
        char *tmp_end, *value;
        char delim;
+       kuid_t uid;
+       kgid_t gid;
 
        separator[0] = ',';

        separator[1] = 0;

fs/cifs/connect.c +7 -1

@@ -1361,7 +1363,13 @@ cifs_parse_mount_options(const char *mountdata,
 const char *devname,
                                        __func__);
                                goto cifs_parse_mount_err;
                        }
-                       vol->backupuid = option;
+                       uid = make_kuid(current_user_ns(), option);
+                       if (!uid_valid(uid)) {
+                               cERROR(1, "%s: Invalid backupuid value",
+                                       __func__);
+                               goto cifs_parse_mount_err;
+                       }
+                       vol->backupuid = uid;
                        vol->backupuid_specified = true;
                        break;

case Opt_backupgid:

fs/cifs/connect.c +7 -1

@@ -1370,7 +1378,13 @@ cifs_parse_mount_options(const char *mountdata,
 const char *devname,
                                        __func__);
                                goto cifs_parse_mount_err;
                        }
-                       vol->backupgid = option;
+                       gid = make_kgid(current_user_ns(), option);
+                       if (!gid_valid(gid)) {
+                               cERROR(1, "%s: Invalid backupgid value",
+                                       __func__);
+                               goto cifs_parse_mount_err;
+                       }
+                       vol->backupgid = gid;
                        vol->backupgid_specified = true;
                        break;

case Opt_uid:

fs/cifs/connect.c +7 -1

@@ -1379,7 +1393,13 @@ cifs_parse_mount_options(const char *mountdata,
 const char *devname,
                                        __func__);
                                goto cifs_parse_mount_err;
                        }
-                       vol->linux_uid = option;
+                       uid = make_kuid(current_user_ns(), option);
+                       if (!uid_valid(uid)) {
+                               cERROR(1, "%s: Invalid uid value",
+                                       __func__);
+                               goto cifs_parse_mount_err;
+                       }
+                       vol->linux_uid = uid;
                        uid_specified = true;
                        break;

case Opt_cruid:

fs/cifs/connect.c +7 -1

@@ -1388,7 +1408,13 @@ cifs_parse_mount_options(const char *mountdata,
 const char *devname,
                                        __func__);
                                goto cifs_parse_mount_err;
                        }
-                       vol->cred_uid = option;
+                       uid = make_kuid(current_user_ns(), option);
+                       if (!uid_valid(uid)) {
+                               cERROR(1, "%s: Invalid cruid value",
+                                       __func__);
+                               goto cifs_parse_mount_err;
+                       }
+                       vol->cred_uid = uid;
                        break;
                case Opt_gid:

                        if (get_option_ul(args, &option)) {

fs/cifs/connect.c +7 -1

@@ -1396,7 +1422,13 @@ cifs_parse_mount_options(const char *mountdata,
 const char *devname,
                                                __func__);
                                goto cifs_parse_mount_err;
                        }
-                       vol->linux_gid = option;
+                       gid = make_kgid(current_user_ns(), option);
+                       if (!gid_valid(gid)) {
+                               cERROR(1, "%s: Invalid gid value",
+                                       __func__);
+                               goto cifs_parse_mount_err;
+                       }
+                       vol->linux_gid = gid;
                        gid_specified = true;
                        break;

case Opt_file_mode:

fs/cifs/connect.c +1 -1

@@ -2203,7 +2235,7 @@ static int match_session(struct cifs_ses *ses,
 struct smb_vol *vol)
 {
        switch (ses->server->secType) {
        case Kerberos:
-               if (vol->cred_uid != ses->cred_uid)
+               if (!uid_eq(vol->cred_uid, ses->cred_uid))
                        return 0;
                break;

default:

fs/cifs/connect.c +1 -1

@@ -2692,7 +2724,7 @@ compare_mount_options(struct super_block *sb, struct
 cifs_mnt_data *mnt_data)
        if (new->rsize && new->rsize < old->rsize)
                return 0;
 
-       if (old->mnt_uid != new->mnt_uid || old->mnt_gid != new->mnt_gid)
+       if (!uid_eq(old->mnt_uid, new->mnt_uid) || !gid_eq(old->mnt_gid,
 new->mnt_gid))
                return 0;

        if (old->mnt_file_mode != new->mnt_file_mode ||

fs/cifs/connect.c +1 -1

@@ -3910,7 +3942,7 @@ cifs_set_vol_auth(struct smb_vol *vol, struct
 cifs_ses *ses)
 }
 
 static struct cifs_tcon *
-cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid)
+cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid)
 {
        int rc;

        struct cifs_tcon *master_tcon = cifs_sb_master_tcon(cifs_sb);

fs/cifs/connect.c +4 -4

@@ -3980,7 +4012,7 @@ cifs_sb_tcon_pending_wait(void *unused)
 
 /* find and return a tlink with given uid */
 static struct tcon_link *
-tlink_rb_search(struct rb_root *root, uid_t uid)
+tlink_rb_search(struct rb_root *root, kuid_t uid)
 {
        struct rb_node *node = root->rb_node;
        struct tcon_link *tlink;

@@ -3988,9 +4020,9 @@ tlink_rb_search(struct rb_root *root, uid_t uid)
        while (node) {
                tlink = rb_entry(node, struct tcon_link, tl_rbnode);
 
-               if (tlink->tl_uid > uid)
+               if (uid_gt(tlink->tl_uid, uid))
                        node = node->rb_left;
-               else if (tlink->tl_uid < uid)
+               else if (uid_lt(tlink->tl_uid, uid))
                        node = node->rb_right;
                else
                        return tlink;

@@ -4009,7 +4041,7 @@ tlink_rb_insert(struct rb_root *root, struct
 tcon_link *new_tlink)
                tlink = rb_entry(*new, struct tcon_link, tl_rbnode);
                parent = *new;
 
-               if (tlink->tl_uid > new_tlink->tl_uid)
+               if (uid_gt(tlink->tl_uid, new_tlink->tl_uid))
                        new = &((*new)->rb_left);
                else

                        new = &((*new)->rb_right);

fs/cifs/connect.c +1 -1

@@ -4039,7 +4071,7 @@ struct tcon_link *
 cifs_sb_tlink(struct cifs_sb_info *cifs_sb)
 {
        int ret;
-       uid_t fsuid = current_fsuid();
+       kuid_t fsuid = current_fsuid();
        struct tcon_link *tlink, *newtlink;
 
        if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER))

fs/cifs/dir.c +5 -5

index 7c0a812..d2c4062 100644
@@ -310,14 +310,14 @@ cifs_do_create(struct inode *inode, struct dentry
 *direntry, unsigned int xid,
 
                *created |= FILE_CREATED;
                if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
-                       args.uid = (__u64) current_fsuid();
+                       args.uid = current_fsuid();
                        if (inode->i_mode & S_ISGID)
-                               args.gid = (__u64) inode->i_gid;
+                               args.gid = inode->i_gid;
                        else
-                               args.gid = (__u64) current_fsgid();
+                               args.gid = current_fsgid();
                } else {
-                       args.uid = NO_CHANGE_64;
-                       args.gid = NO_CHANGE_64;
+                       args.uid = NO_CHANGE_UID;
+                       args.gid = NO_CHANGE_GID;
                }
                CIFSSMBUnixSetFileInfo(xid, tcon, &args, fid->netfid,

                                       current->tgid);

fs/cifs/dir.c +4 -4

@@ -547,11 +547,11 @@ int cifs_mknod(struct inode *inode, struct dentry
 *direntry, umode_t mode,
                        .device = device_number,
                };
                if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
-                       args.uid = (__u64) current_fsuid();
-                       args.gid = (__u64) current_fsgid();
+                       args.uid = current_fsuid();
+                       args.gid = current_fsgid();
                } else {
-                       args.uid = NO_CHANGE_64;
-                       args.gid = NO_CHANGE_64;
+                       args.uid = NO_CHANGE_UID;
+                       args.gid = NO_CHANGE_GID;
                }
                rc = CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, &args,

                                            cifs_sb->local_nls,

fs/cifs/file.c +2 -2

index edb25b4..603863c 100644
@@ -487,8 +487,8 @@ int cifs_open(struct inode *inode, struct file *file)
                 */
                struct cifs_unix_set_info_args args = {
                        .mode   = inode->i_mode,
-                       .uid    = NO_CHANGE_64,
-                       .gid    = NO_CHANGE_64,
+                       .uid    = NO_CHANGE_UID,
+                       .gid    = NO_CHANGE_GID,
                        .ctime  = NO_CHANGE_64,
                        .atime  = NO_CHANGE_64,
                        .mtime  = NO_CHANGE_64,

@@ -1631,7 +1631,7 @@ struct cifsFileInfo *find_readable_file(struct
 cifsInodeInfo *cifs_inode,
           are always at the end of the list but since the first entry

might
have a close pending, we go through the whole list */
list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {

fs/cifs/file.c +2 -2

-               if (fsuid_only && open_file->uid != current_fsuid())
+               if (fsuid_only && !uid_eq(open_file->uid, current_fsuid()))
                        continue;
                if (OPEN_FMODE(open_file->f_flags) & FMODE_READ) {
                        if (!open_file->invalidHandle) {

@@ -1684,7 +1684,7 @@ refind_writable:
        list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
                if (!any_available && open_file->pid != current->tgid)
                        continue;
-               if (fsuid_only && open_file->uid != current_fsuid())
+               if (fsuid_only && !uid_eq(open_file->uid, current_fsuid()))
                        continue;
                if (OPEN_FMODE(open_file->f_flags) & FMODE_WRITE) {
                        if (!open_file->invalidHandle) {

fs/cifs/inode.c +2 -2

index afdff79..c43bfa2 100644
@@ -247,12 +247,12 @@ cifs_unix_basic_to_fattr(struct cifs_fattr *fattr,
 FILE_UNIX_BASIC_INFO *info,
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)
                fattr->cf_uid = cifs_sb->mnt_uid;
        else
-               fattr->cf_uid = le64_to_cpu(info->Uid);
+               fattr->cf_uid = make_kuid(&init_user_ns,
 le64_to_cpu(info->Uid));
 
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID)
                fattr->cf_gid = cifs_sb->mnt_gid;
        else
-               fattr->cf_gid = le64_to_cpu(info->Gid);
+               fattr->cf_gid = make_kgid(&init_user_ns,
 le64_to_cpu(info->Gid));

        fattr->cf_nlink = le64_to_cpu(info->Nlinks);

}

fs/cifs/inode.c +6 -6

@@ -1245,14 +1245,14 @@ cifs_mkdir_qinfo(struct inode *parent, struct
 dentry *dentry, umode_t mode,
                        .device = 0,
                };
                if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
-                       args.uid = (__u64)current_fsuid();
-                       if (parent->i_mode & S_ISGID)
-                               args.gid = (__u64)parent->i_gid;
+                       args.uid = current_fsuid();
+                       if (inode->i_mode & S_ISGID)
+                               args.gid = inode->i_gid;
                        else
-                               args.gid = (__u64)current_fsgid();
+                               args.gid = current_fsgid();
                } else {
-                       args.uid = NO_CHANGE_64;
-                       args.gid = NO_CHANGE_64;
+                       args.uid = INVALID_UID;
+                       args.gid = INVALID_GID;
                }
                CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args,

                                       cifs_sb->local_nls,

fs/cifs/inode.c +2 -2

@@ -2012,12 +2012,12 @@ cifs_setattr_unix(struct dentry *direntry, struct
 iattr *attrs)
        if (attrs->ia_valid & ATTR_UID)
                args->uid = attrs->ia_uid;
        else
-               args->uid = NO_CHANGE_64;
+               args->uid = NO_CHANGE_UID;
 
        if (attrs->ia_valid & ATTR_GID)
                args->gid = attrs->ia_gid;
        else
-               args->gid = NO_CHANGE_64;
+               args->gid = NO_CHANGE_GID;
 
        if (attrs->ia_valid & ATTR_ATIME)

                args->atime = cifs_UnixTimeToNT(attrs->ia_atime);

fs/cifs/inode.c +3 -3

@@ -2085,8 +2085,8 @@ static int
 cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
 {
        unsigned int xid;
-       uid_t uid = NO_CHANGE_32;
-       gid_t gid = NO_CHANGE_32;
+       kuid_t uid = NO_CHANGE_UID;
+       kgid_t gid = NO_CHANGE_GID;
        struct inode *inode = direntry->d_inode;
        struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
        struct cifsInodeInfo *cifsInode = CIFS_I(inode);

@@ -2145,7 +2145,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct
 iattr *attrs)
 
 #ifdef CONFIG_CIFS_ACL
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
-               if (uid != NO_CHANGE_32 || gid != NO_CHANGE_32) {
+               if (!uid_eq(uid, NO_CHANGE_UID) || !gid_eq(gid,
 NO_CHANGE_GID)) {
                        rc = id_mode_to_cifs_acl(inode, full_path,

NO_CHANGE_64,

                                                        uid, gid);
                        if (rc) {

fs/cifs/inode.c +1 -1

@@ -2169,7 +2169,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct
 iattr *attrs)
 #ifdef CONFIG_CIFS_ACL
                if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
                        rc = id_mode_to_cifs_acl(inode, full_path, mode,
-                                               NO_CHANGE_32,
 NO_CHANGE_32);
+                                               NO_CHANGE_UID,
 NO_CHANGE_GID);

if (rc) {
cFYI(1, "%s: Setting ACL failed with
error: %d",

                                        __func__, rc);

fs/cifs/misc.c +1 -1

index 3a00c0d..1b15bf8 100644
@@ -569,7 +569,7 @@ bool
 backup_cred(struct cifs_sb_info *cifs_sb)
 {
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID) {
-               if (cifs_sb->mnt_backupuid == current_fsuid())
+               if (uid_eq(cifs_sb->mnt_backupuid, current_fsuid()))
                        return true;
        }
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPGID) {

init/Kconfig +0 -2

index cb2c46a..58959ea 100644
@@ -999,7 +999,6 @@ config UIDGID_CONVERTED
        default y
 
        # Filesystems
-       depends on CIFS = n
        depends on CODA_FS = n
        depends on GFS2_FS = n
        depends on NCP_FS = n
--

1.7.5.4

Do you have a pointer to the background on kuid/kgid

Do you have a pointer to the background on kuid/kgid

From: "Eric W. Biederman" <ebiederm-aS9lmoZGLiVWk0Htik3J/[email protected]>

Cc Steve French <[email protected]>

Acked-by Serge Hallyn <[email protected]>

Signed-off-by Eric W. Biederman <ebiederm-aS9lmoZGLiVWk0Htik3J/[email protected]>

---
 fs/cifs/cifs_fs_sb.h  |    8 ++--
 fs/cifs/cifs_spnego.c |    4 +-
 fs/cifs/cifsacl.c     |  115 ++++++++++++++++++++++++++++++++++++------------
 fs/cifs/cifsacl.h     |   16 ++++++-
 fs/cifs/cifsfs.c      |   12 +++--
 fs/cifs/cifsglob.h    |   22 +++++-----
 fs/cifs/cifspdu.h     |    2 +
 fs/cifs/cifsproto.h   |    9 ++--
 fs/cifs/cifssmb.c     |   11 ++++-
 fs/cifs/connect.c     |   58 +++++++++++++++++++------
 fs/cifs/dir.c         |   18 ++++----
 fs/cifs/file.c        |    8 ++--
 fs/cifs/inode.c       |   28 ++++++------
 fs/cifs/misc.c        |    2 +-
 init/Kconfig          |    1 -
 15 files changed, 213 insertions(+), 101 deletions(-)

fs/cifs/cifs_fs_sb.h +4 -4

index c865bfd..37e4a72 100644
@@ -55,10 +55,10 @@ struct cifs_sb_info {
 	unsigned int wsize;
 	unsigned long actimeo; /* attribute cache timeout (jiffies) */
 	atomic_t active;
-	uid_t	mnt_uid;
-	gid_t	mnt_gid;
-	uid_t	mnt_backupuid;
-	gid_t	mnt_backupgid;
+	kuid_t	mnt_uid;
+	kgid_t	mnt_gid;
+	kuid_t	mnt_backupuid;
+	kgid_t	mnt_backupgid;
 	umode_t	mnt_file_mode;
 	umode_t	mnt_dir_mode;
 	unsigned int mnt_cifs_flags;

fs/cifs/cifs_spnego.c +2 -2

index 086f381..014a4c2 100644
@@ -149,10 +149,10 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo)
 		goto out;
 
 	dp = description + strlen(description);
-	sprintf(dp, ";uid=0x%x", sesInfo->linux_uid);
+	sprintf(dp, ";uid=0x%x", from_kuid_munged(&init_user_ns, sesInfo->linux_uid));
 
 	dp = description + strlen(description);
-	sprintf(dp, ";creduid=0x%x", sesInfo->cred_uid);
+	sprintf(dp, ";creduid=0x%x", from_kuid_munged(&init_user_ns, sesInfo->cred_uid));
 
 	if (sesInfo->user_name) {
 		dp = description + strlen(description);

fs/cifs/cifsacl.c +86 -29

index fc783e2..0f8b920 100644
@@ -44,6 +44,55 @@ static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} };
 
 const struct cred *root_cred;
 
+static inline struct cifs_id kuid_to_cid(kuid_t uid)
+{
+	struct cifs_id cid;
+	cid.type = SIDOWNER;
+	cid.uid = uid;
+	return cid;
+}
+
+static inline struct cifs_id kgid_to_cid(kgid_t gid)
+{
+	struct cifs_id cid;
+	cid.type = SIDGROUP;
+	cid.gid = gid;
+	return cid;
+}
+
+static unsigned long from_cid(struct user_namespace *user_ns, struct cifs_id cid)
+{
+	switch (cid.type) {
+	case SIDOWNER:
+		return from_kuid(user_ns, cid.uid);
+	case SIDGROUP:
+		return from_kgid(user_ns, cid.gid);
+	default:
+		BUG();
+	}
+}
+
+static bool cid_lt(struct cifs_id left, struct cifs_id right)
+{
+	if (left.type < right.type)
+		return true;
+	if (left.type > right.type)
+		return false;
+	switch (left.type) {
+	case SIDOWNER:
+		return uid_lt(left.uid, right.uid);
+	case SIDGROUP:
+		return gid_lt(left.gid, right.gid);
+	default:
+		BUG();
+	}
+}
+
+static inline bool cid_gt(struct cifs_id left, struct cifs_id right)
+{
+	return cid_lt(right, left);
+}
+
 static void
 shrink_idmap_tree(struct rb_root *root, int nr_to_scan, int *nr_rem,
 			int *nr_del)

@@ -105,7 +154,7 @@ cifs_idmap_shrinker(struct shrinker *shrink, struct shrink_control *sc)
 }
 
 static void
-sid_rb_insert(struct rb_root *root, unsigned long cid,
+sid_rb_insert(struct rb_root *root, struct cifs_id cid,
 		struct cifs_sid_id **psidid, char *typestr)
 {
 	char *strptr;

@@ -117,11 +166,11 @@ sid_rb_insert(struct rb_root *root, unsigned long cid,
 	while (node) {
 		lsidid = rb_entry(node, struct cifs_sid_id, rbnode);
 		parent = node;
-		if (cid > lsidid->id) {
+		if (cid_gt(cid, lsidid->id)) {
 			linkto = &(node->rb_left);
 			node = node->rb_left;
 		}
-		if (cid < lsidid->id) {
+		if (cid_lt(cid, lsidid->id)) {
 			linkto = &(node->rb_right);
 			node = node->rb_right;
 		}

@@ -133,7 +182,7 @@ sid_rb_insert(struct rb_root *root, unsigned long cid,
 
 	sprintf((*psidid)->sidstr, "%s", typestr);
 	strptr = (*psidid)->sidstr + strlen((*psidid)->sidstr);
-	sprintf(strptr, "%ld", cid);
+	sprintf(strptr, "%ld", from_cid(&init_user_ns, cid));
 
 	clear_bit(SID_ID_PENDING, &(*psidid)->state);
 	clear_bit(SID_ID_MAPPED, &(*psidid)->state);

@@ -143,16 +192,16 @@ sid_rb_insert(struct rb_root *root, unsigned long cid,
 }
 
 static struct cifs_sid_id *
-sid_rb_search(struct rb_root *root, unsigned long cid)
+sid_rb_search(struct rb_root *root, struct cifs_id cid)
 {
 	struct rb_node *node = root->rb_node;
 	struct cifs_sid_id *lsidid;
 
 	while (node) {
 		lsidid = rb_entry(node, struct cifs_sid_id, rbnode);
-		if (cid > lsidid->id)
+		if (cid_gt(cid, lsidid->id))
 			node = node->rb_left;
-		else if (cid < lsidid->id)
+		else if (cid_lt(cid, lsidid->id))
 			node = node->rb_right;
 		else /* node found */
 			return lsidid;

@@ -292,7 +341,7 @@ sidid_pending_wait(void *unused)
 }
 
 static int
-id_to_sid(unsigned long cid, uint sidtype, struct cifs_sid *ssid)
+id_to_sid(struct cifs_id cid, struct cifs_sid *ssid)
 {
 	int rc = 0;
 	struct key *sidkey;

@@ -302,10 +351,10 @@ id_to_sid(unsigned long cid, uint sidtype, struct cifs_sid *ssid)
 	struct rb_root *cidtree;
 	spinlock_t *cidlock;
 
-	if (sidtype == SIDOWNER) {
+	if (cid.type == SIDOWNER) {
 		cidlock = &siduidlock;
 		cidtree = &uidtree;
-	} else if (sidtype == SIDGROUP) {
+	} else if (cid.type == SIDGROUP) {
 		cidlock = &sidgidlock;
 		cidtree = &gidtree;
 	} else

@@ -336,7 +385,7 @@ id_to_sid(unsigned long cid, uint sidtype, struct cifs_sid *ssid)
 		} else {
 			psidid = npsidid;
 			sid_rb_insert(cidtree, cid, &psidid,
-					sidtype == SIDOWNER ? "oi:" : "gi:");
+					cid.type == SIDOWNER ? "oi:" : "gi:");
 			++psidid->refcount;
 			spin_unlock(cidlock);
 		}

@@ -410,7 +459,7 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,
 		struct cifs_fattr *fattr, uint sidtype)
 {
 	int rc;
-	unsigned long cid;
+	struct cifs_id cid;
 	struct key *idkey;
 	const struct cred *saved_cred;
 	struct cifs_sid_id *psidid, *npsidid;

@@ -418,11 +467,11 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,
 	spinlock_t *cidlock;
 
 	if (sidtype == SIDOWNER) {
-		cid = cifs_sb->mnt_uid; /* default uid, in case upcall fails */
+		cid = kuid_to_cid(cifs_sb->mnt_uid); /* default uid, in case upcall fails */
 		cidlock = &siduidlock;
 		cidtree = &uidtree;
 	} else if (sidtype == SIDGROUP) {
-		cid = cifs_sb->mnt_gid; /* default gid, in case upcall fails */
+		cid = kgid_to_cid(cifs_sb->mnt_gid); /* default gid, in case upcall fails */
 		cidlock = &sidgidlock;
 		cidtree = &gidtree;
 	} else

@@ -471,7 +520,7 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,
 	 * any fields of the node after a reference is put .
 	 */
 	if (test_bit(SID_ID_MAPPED, &psidid->state)) {
-		cid = psidid->id;
+		//cid = psidid->id;
 		psidid->time = jiffies; /* update ts for accessing */
 		goto sid_to_id_out;
 	}

@@ -485,8 +534,13 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,
 		if (IS_ERR(idkey))
 			cFYI(1, "%s: Can't map SID to an id", __func__);
 		else {
-			cid = *(unsigned long *)idkey->payload.value;
-			psidid->id = cid;
+			u32 id;
+			id = *(u32 *)idkey->payload.value;
+			psidid->id.type = sidtype;
+			if (sidtype == SIDOWNER)
+				psidid->id.uid = make_kuid(&init_user_ns, id);
+			else
+				psidid->id.gid = make_kgid(&init_user_ns, id);
 			set_bit(SID_ID_MAPPED, &psidid->state);
 			key_put(idkey);
 			kfree(psidid->sidstr);

@@ -510,10 +564,10 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,
 
 sid_to_id_out:
 	--psidid->refcount; /* decremented without spinlock */
-	if (sidtype == SIDOWNER)
-		fattr->cf_uid = cid;
+	if (cid.type == SIDOWNER)
+		fattr->cf_uid = cid.uid;
 	else
-		fattr->cf_gid = cid;
+		fattr->cf_gid = cid.gid;
 
 	return 0;
 }

@@ -537,7 +591,8 @@ init_cifs_idmap(void)
 	if (!cred)
 		return -ENOMEM;
 
-	keyring = key_alloc(&key_type_keyring, ".cifs_idmap", 0, 0, cred,
+	keyring = key_alloc(&key_type_keyring, ".cifs_idmap",
+			    GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
 			    (KEY_POS_ALL & ~KEY_POS_SETATTR) |
 			    KEY_USR_VIEW | KEY_USR_READ,
 			    KEY_ALLOC_NOT_IN_QUOTA);

@@ -1074,7 +1129,7 @@ static int parse_sec_desc(struct cifs_sb_info *cifs_sb,
 
 /* Convert permission bits from mode to equivalent CIFS ACL */
 static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd,
-	__u32 secdesclen, __u64 nmode, uid_t uid, gid_t gid, int *aclflag)
+	__u32 secdesclen, __u64 nmode, kuid_t uid, kgid_t gid, int *aclflag)
 {
 	int rc = 0;
 	__u32 dacloffset;

@@ -1106,17 +1161,18 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd,
 		*aclflag = CIFS_ACL_DACL;
 	} else {
 		memcpy(pnntsd, pntsd, secdesclen);
-		if (uid != NO_CHANGE_32) { /* chown */
+		if (!uid_eq(uid, NO_CHANGE_UID)) { /* chown */
 			owner_sid_ptr = (struct cifs_sid *)((char *)pnntsd +
 					le32_to_cpu(pnntsd->osidoffset));
 			nowner_sid_ptr = kmalloc(sizeof(struct cifs_sid),
 								GFP_KERNEL);
 			if (!nowner_sid_ptr)
 				return -ENOMEM;
-			rc = id_to_sid(uid, SIDOWNER, nowner_sid_ptr);
+			rc = id_to_sid(kuid_to_cid(uid), nowner_sid_ptr);
 			if (rc) {
 				cFYI(1, "%s: Mapping error %d for owner id %d",
-						__func__, rc, uid);
+						__func__, rc,
+						from_kuid(&init_user_ns, uid));
 				kfree(nowner_sid_ptr);
 				return rc;
 			}

@@ -1125,17 +1181,18 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd,
 			kfree(nowner_sid_ptr);
 			*aclflag = CIFS_ACL_OWNER;
 		}
-		if (gid != NO_CHANGE_32) { /* chgrp */
+		if (!gid_eq(gid, NO_CHANGE_GID)) { /* chgrp */
 			group_sid_ptr = (struct cifs_sid *)((char *)pnntsd +
 					le32_to_cpu(pnntsd->gsidoffset));
 			ngroup_sid_ptr = kmalloc(sizeof(struct cifs_sid),
 								GFP_KERNEL);
 			if (!ngroup_sid_ptr)
 				return -ENOMEM;
-			rc = id_to_sid(gid, SIDGROUP, ngroup_sid_ptr);
+			rc = id_to_sid(kgid_to_cid(gid), ngroup_sid_ptr);
 			if (rc) {
 				cFYI(1, "%s: Mapping error %d for group id %d",
-						__func__, rc, gid);
+						__func__, rc,
+						from_kgid(&init_user_ns, gid));
 				kfree(ngroup_sid_ptr);
 				return rc;
 			}

@@ -1304,7 +1361,7 @@ cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb, struct cifs_fattr *fattr,
 /* Convert mode bits to an ACL so we can update the ACL on the server */
 int
 id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 nmode,
-			uid_t uid, gid_t gid)
+			kuid_t uid, kgid_t gid)
 {
 	int rc = 0;
 	int aclflag = CIFS_ACL_DACL; /* default flag to set */

fs/cifs/cifsacl.h +13 -3

index 5c902c7..233c576 100644
@@ -39,8 +39,10 @@
 #define ACCESS_ALLOWED	0
 #define ACCESS_DENIED	1
 
-#define SIDOWNER 1
-#define SIDGROUP 2
+enum sidtype {
+	SIDOWNER = 1,
+	SIDGROUP = 2,
+};
 #define SIDLEN 150 /* S- 1 revision- 6 authorities- max 5 sub authorities */
 
 #define SID_ID_MAPPED 0

@@ -83,9 +85,17 @@ struct cifs_wksid {
 	char sidname[SIDNAMELENGTH];
 } __attribute__((packed));
 
+struct cifs_id {
+	enum sidtype type;
+	union {
+		kuid_t uid;
+		kgid_t gid;
+	};
+};
+
 struct cifs_sid_id {
 	unsigned int refcount; /* increment with spinlock, decrement without */
-	unsigned long id;
+	struct cifs_id id;
 	unsigned long time;
 	unsigned long state;
 	char *sidstr;

fs/cifs/cifsfs.c +8 -4

index e7931cc..0a4740b 100644
@@ -377,13 +377,13 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
 				   (int)(srcaddr->sa_family));
 	}
 
-	seq_printf(s, ",uid=%u", cifs_sb->mnt_uid);
+	seq_printf(s, ",uid=%u", from_kuid_munged(&init_user_ns, cifs_sb->mnt_uid));
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)
 		seq_printf(s, ",forceuid");
 	else
 		seq_printf(s, ",noforceuid");
 
-	seq_printf(s, ",gid=%u", cifs_sb->mnt_gid);
+	seq_printf(s, ",gid=%u", from_kgid_munged(&init_user_ns, cifs_sb->mnt_gid));
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID)
 		seq_printf(s, ",forcegid");
 	else

@@ -438,9 +438,13 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
 		seq_printf(s, ",noperm");
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID)
-		seq_printf(s, ",backupuid=%u", cifs_sb->mnt_backupuid);
+		seq_printf(s, ",backupuid=%u",
+			   from_kuid_munged(&init_user_ns,
+					    cifs_sb->mnt_backupuid));
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPGID)
-		seq_printf(s, ",backupgid=%u", cifs_sb->mnt_backupgid);
+		seq_printf(s, ",backupgid=%u",
+			   from_kgid_munged(&init_user_ns,
+					    cifs_sb->mnt_backupgid));
 
 	seq_printf(s, ",rsize=%u", cifs_sb->rsize);
 	seq_printf(s, ",wsize=%u", cifs_sb->wsize);

fs/cifs/cifsglob.h +11 -11

index f5af252..97f1683 100644
@@ -400,11 +400,11 @@ struct smb_vol {
 	char *iocharset;  /* local code page for mapping to and from Unicode */
 	char source_rfc1001_name[RFC1001_NAME_LEN_WITH_NULL]; /* clnt nb name */
 	char target_rfc1001_name[RFC1001_NAME_LEN_WITH_NULL]; /* srvr nb name */
-	uid_t cred_uid;
-	uid_t linux_uid;
-	gid_t linux_gid;
-	uid_t backupuid;
-	gid_t backupgid;
+	kuid_t cred_uid;
+	kuid_t linux_uid;
+	kgid_t linux_gid;
+	kuid_t backupuid;
+	kgid_t backupgid;
 	umode_t file_mode;
 	umode_t dir_mode;
 	unsigned secFlg;

@@ -703,8 +703,8 @@ struct cifs_ses {
 	char *serverNOS;	/* name of network operating system of server */
 	char *serverDomain;	/* security realm of server */
 	__u64 Suid;		/* remote smb uid  */
-	uid_t linux_uid;        /* overriding owner of files on the mount */
-	uid_t cred_uid;		/* owner of credentials */
+	kuid_t linux_uid;       /* overriding owner of files on the mount */
+	kuid_t cred_uid;	/* owner of credentials */
 	unsigned int capabilities;
 	char serverName[SERVER_NAME_LEN_WITH_NULL * 2];	/* BB make bigger for
 				TCP names - will ipv6 and sctp addresses fit? */

@@ -838,7 +838,7 @@ struct cifs_tcon {
  */
 struct tcon_link {
 	struct rb_node		tl_rbnode;
-	uid_t			tl_uid;
+	kuid_t			tl_uid;
 	unsigned long		tl_flags;
 #define TCON_LINK_MASTER	0
 #define TCON_LINK_PENDING	1

@@ -931,7 +931,7 @@ struct cifsFileInfo {
 	struct list_head tlist;	/* pointer to next fid owned by tcon */
 	struct list_head flist;	/* next fid (file instance) for this inode */
 	struct cifs_fid_locks *llist;	/* brlocks held by this fid */
-	unsigned int uid;	/* allows finding which FileInfo structure */
+	kuid_t uid;		/* allows finding which FileInfo structure */
 	__u32 pid;		/* process id who opened file */
 	struct cifs_fid fid;	/* file id from remote */
 	/* BB add lock scope info here if needed */ ;

@@ -1259,8 +1259,8 @@ struct cifs_fattr {
 	u64		cf_eof;
 	u64		cf_bytes;
 	u64		cf_createtime;
-	uid_t		cf_uid;
-	gid_t		cf_gid;
+	kuid_t		cf_uid;
+	kgid_t		cf_gid;
 	umode_t		cf_mode;
 	dev_t		cf_rdev;
 	unsigned int	cf_nlink;

fs/cifs/cifspdu.h +2 -0

index b9d59a9..2ede310 100644
@@ -278,6 +278,8 @@
 
 #define NO_CHANGE_64          0xFFFFFFFFFFFFFFFFULL
 #define NO_CHANGE_32          0xFFFFFFFFUL
+#define NO_CHANGE_UID         INVALID_UID
+#define NO_CHANGE_GID         INVALID_GID
 
 /* IPC$ in ASCII */
 #define CIFS_IPC_RESOURCE "\x49\x50\x43\x24"

fs/cifs/cifsproto.h +5 -4

index 5144e9f..27b268a 100644
@@ -46,7 +46,8 @@ extern void _free_xid(unsigned int);
 ({								\
 	unsigned int __xid = _get_xid();				\
 	cFYI(1, "CIFS VFS: in %s as Xid: %u with uid: %d",	\
-	     __func__, __xid, current_fsuid());			\
+	     __func__, __xid, 					\
+	     from_kuid(&init_user_ns, current_fsuid()));	\
 	__xid;							\
 })
 

@@ -161,7 +162,7 @@ extern int cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb,
 			      struct cifs_fattr *fattr, struct inode *inode,
 			      const char *path, const __u16 *pfid);
 extern int id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64,
-					uid_t, gid_t);
+					kuid_t, kgid_t);
 extern struct cifs_ntsd *get_cifs_acl(struct cifs_sb_info *, struct inode *,
 					const char *, u32 *);
 extern int set_cifs_acl(struct cifs_ntsd *, __u32, struct inode *,

@@ -304,8 +305,8 @@ struct cifs_unix_set_info_args {
 	__u64	atime;
 	__u64	mtime;
 	__u64	mode;
-	__u64	uid;
-	__u64	gid;
+	kuid_t	uid;
+	kgid_t	gid;
 	dev_t	device;
 };
 

fs/cifs/cifssmb.c +9 -2

index 76d0d29..6b88d47 100644
@@ -5820,6 +5820,13 @@ cifs_fill_unix_set_info(FILE_UNIX_BASIC_INFO *data_offset,
 			const struct cifs_unix_set_info_args *args)
 {
 	u64 mode = args->mode;
+	__u64 uid;
+	__u64 gid;
+
+	uid = uid_eq(args->uid, NO_CHANGE_UID) ? NO_CHANGE_64:
+		(__u64)from_kuid(&init_user_ns, args->uid);
+	gid = gid_eq(args->gid, NO_CHANGE_GID) ? NO_CHANGE_64:
+		(__u64)from_kgid(&init_user_ns, args->gid);
 
 	/*
 	 * Samba server ignores set of file size to zero due to bugs in some

@@ -5833,8 +5840,8 @@ cifs_fill_unix_set_info(FILE_UNIX_BASIC_INFO *data_offset,
 	data_offset->LastStatusChange = cpu_to_le64(args->ctime);
 	data_offset->LastAccessTime = cpu_to_le64(args->atime);
 	data_offset->LastModificationTime = cpu_to_le64(args->mtime);
-	data_offset->Uid = cpu_to_le64(args->uid);
-	data_offset->Gid = cpu_to_le64(args->gid);
+	data_offset->Uid = cpu_to_le64(uid);
+	data_offset->Gid = cpu_to_le64(gid);
 	/* better to leave device as zero when it is  */
 	data_offset->DevMajor = cpu_to_le64(MAJOR(args->device));
 	data_offset->DevMinor = cpu_to_le64(MINOR(args->device));

fs/cifs/connect.c +45 -13

index 5c670b9..dab3cf1 100644
@@ -1108,6 +1108,8 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 	char *string = NULL;
 	char *tmp_end, *value;
 	char delim;
+	kuid_t uid;
+	kgid_t gid;
 
 	separator[0] = ',';
 	separator[1] = 0;

@@ -1361,7 +1363,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 					__func__);
 				goto cifs_parse_mount_err;
 			}
-			vol->backupuid = option;
+			uid = make_kuid(current_user_ns(), option);
+			if (!uid_valid(uid)) {
+				cERROR(1, "%s: Invalid backupuid value",
+					__func__);
+				goto cifs_parse_mount_err;
+			}
+			vol->backupuid = uid;
 			vol->backupuid_specified = true;
 			break;
 		case Opt_backupgid:

@@ -1370,7 +1378,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 					__func__);
 				goto cifs_parse_mount_err;
 			}
-			vol->backupgid = option;
+			gid = make_kgid(current_user_ns(), option);
+			if (!gid_valid(gid)) {
+				cERROR(1, "%s: Invalid backupgid value",
+					__func__);
+				goto cifs_parse_mount_err;
+			}
+			vol->backupgid = gid;
 			vol->backupgid_specified = true;
 			break;
 		case Opt_uid:

@@ -1379,7 +1393,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 					__func__);
 				goto cifs_parse_mount_err;
 			}
-			vol->linux_uid = option;
+			uid = make_kuid(current_user_ns(), option);
+			if (!uid_valid(uid)) {
+				cERROR(1, "%s: Invalid uid value",
+					__func__);
+				goto cifs_parse_mount_err;
+			}
+			vol->linux_uid = uid;
 			uid_specified = true;
 			break;
 		case Opt_cruid:

@@ -1388,7 +1408,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 					__func__);
 				goto cifs_parse_mount_err;
 			}
-			vol->cred_uid = option;
+			uid = make_kuid(current_user_ns(), option);
+			if (!uid_valid(uid)) {
+				cERROR(1, "%s: Invalid cruid value",
+					__func__);
+				goto cifs_parse_mount_err;
+			}
+			vol->cred_uid = uid;
 			break;
 		case Opt_gid:
 			if (get_option_ul(args, &option)) {

@@ -1396,7 +1422,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 						__func__);
 				goto cifs_parse_mount_err;
 			}
-			vol->linux_gid = option;
+			gid = make_kgid(current_user_ns(), option);
+			if (!gid_valid(gid)) {
+				cERROR(1, "%s: Invalid gid value",
+					__func__);
+				goto cifs_parse_mount_err;
+			}
+			vol->linux_gid = gid;
 			gid_specified = true;
 			break;
 		case Opt_file_mode:

@@ -2203,7 +2235,7 @@ static int match_session(struct cifs_ses *ses, struct smb_vol *vol)
 {
 	switch (ses->server->secType) {
 	case Kerberos:
-		if (vol->cred_uid != ses->cred_uid)
+		if (!uid_eq(vol->cred_uid, ses->cred_uid))
 			return 0;
 		break;
 	default:

@@ -2692,7 +2724,7 @@ compare_mount_options(struct super_block *sb, struct cifs_mnt_data *mnt_data)
 	if (new->rsize && new->rsize < old->rsize)
 		return 0;
 
-	if (old->mnt_uid != new->mnt_uid || old->mnt_gid != new->mnt_gid)
+	if (!uid_eq(old->mnt_uid, new->mnt_uid) || !gid_eq(old->mnt_gid, new->mnt_gid))
 		return 0;
 
 	if (old->mnt_file_mode != new->mnt_file_mode ||

@@ -3910,7 +3942,7 @@ cifs_set_vol_auth(struct smb_vol *vol, struct cifs_ses *ses)
 }
 
 static struct cifs_tcon *
-cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid)
+cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid)
 {
 	int rc;
 	struct cifs_tcon *master_tcon = cifs_sb_master_tcon(cifs_sb);

@@ -3980,7 +4012,7 @@ cifs_sb_tcon_pending_wait(void *unused)
 
 /* find and return a tlink with given uid */
 static struct tcon_link *
-tlink_rb_search(struct rb_root *root, uid_t uid)
+tlink_rb_search(struct rb_root *root, kuid_t uid)
 {
 	struct rb_node *node = root->rb_node;
 	struct tcon_link *tlink;

@@ -3988,9 +4020,9 @@ tlink_rb_search(struct rb_root *root, uid_t uid)
 	while (node) {
 		tlink = rb_entry(node, struct tcon_link, tl_rbnode);
 
-		if (tlink->tl_uid > uid)
+		if (uid_gt(tlink->tl_uid, uid))
 			node = node->rb_left;
-		else if (tlink->tl_uid < uid)
+		else if (uid_lt(tlink->tl_uid, uid))
 			node = node->rb_right;
 		else
 			return tlink;

@@ -4009,7 +4041,7 @@ tlink_rb_insert(struct rb_root *root, struct tcon_link *new_tlink)
 		tlink = rb_entry(*new, struct tcon_link, tl_rbnode);
 		parent = *new;
 
-		if (tlink->tl_uid > new_tlink->tl_uid)
+		if (uid_gt(tlink->tl_uid, new_tlink->tl_uid))
 			new = &((*new)->rb_left);
 		else
 			new = &((*new)->rb_right);

@@ -4039,7 +4071,7 @@ struct tcon_link *
 cifs_sb_tlink(struct cifs_sb_info *cifs_sb)
 {
 	int ret;
-	uid_t fsuid = current_fsuid();
+	kuid_t fsuid = current_fsuid();
 	struct tcon_link *tlink, *newtlink;
 
 	if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER))

fs/cifs/dir.c +9 -9

index 7c0a812..d2c4062 100644
@@ -310,14 +310,14 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid,
 
 		*created |= FILE_CREATED;
 		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
-			args.uid = (__u64) current_fsuid();
+			args.uid = current_fsuid();
 			if (inode->i_mode & S_ISGID)
-				args.gid = (__u64) inode->i_gid;
+				args.gid = inode->i_gid;
 			else
-				args.gid = (__u64) current_fsgid();
+				args.gid = current_fsgid();
 		} else {
-			args.uid = NO_CHANGE_64;
-			args.gid = NO_CHANGE_64;
+			args.uid = NO_CHANGE_UID;
+			args.gid = NO_CHANGE_GID;
 		}
 		CIFSSMBUnixSetFileInfo(xid, tcon, &args, fid->netfid,
 				       current->tgid);

@@ -547,11 +547,11 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode,
 			.device	= device_number,
 		};
 		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
-			args.uid = (__u64) current_fsuid();
-			args.gid = (__u64) current_fsgid();
+			args.uid = current_fsuid();
+			args.gid = current_fsgid();
 		} else {
-			args.uid = NO_CHANGE_64;
-			args.gid = NO_CHANGE_64;
+			args.uid = NO_CHANGE_UID;
+			args.gid = NO_CHANGE_GID;
 		}
 		rc = CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, &args,
 					    cifs_sb->local_nls,

fs/cifs/file.c +4 -4

index edb25b4..603863c 100644
@@ -487,8 +487,8 @@ int cifs_open(struct inode *inode, struct file *file)
 		 */
 		struct cifs_unix_set_info_args args = {
 			.mode	= inode->i_mode,
-			.uid	= NO_CHANGE_64,
-			.gid	= NO_CHANGE_64,
+			.uid	= NO_CHANGE_UID,
+			.gid	= NO_CHANGE_GID,
 			.ctime	= NO_CHANGE_64,
 			.atime	= NO_CHANGE_64,
 			.mtime	= NO_CHANGE_64,

@@ -1631,7 +1631,7 @@ struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *cifs_inode,
 	   are always at the end of the list but since the first entry might
 	   have a close pending, we go through the whole list */
 	list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
-		if (fsuid_only && open_file->uid != current_fsuid())
+		if (fsuid_only && !uid_eq(open_file->uid, current_fsuid()))
 			continue;
 		if (OPEN_FMODE(open_file->f_flags) & FMODE_READ) {
 			if (!open_file->invalidHandle) {

@@ -1684,7 +1684,7 @@ refind_writable:
 	list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
 		if (!any_available && open_file->pid != current->tgid)
 			continue;
-		if (fsuid_only && open_file->uid != current_fsuid())
+		if (fsuid_only && !uid_eq(open_file->uid, current_fsuid()))
 			continue;
 		if (OPEN_FMODE(open_file->f_flags) & FMODE_WRITE) {
 			if (!open_file->invalidHandle) {

fs/cifs/inode.c +14 -14

index afdff79..c43bfa2 100644
@@ -247,12 +247,12 @@ cifs_unix_basic_to_fattr(struct cifs_fattr *fattr, FILE_UNIX_BASIC_INFO *info,
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)
 		fattr->cf_uid = cifs_sb->mnt_uid;
 	else
-		fattr->cf_uid = le64_to_cpu(info->Uid);
+		fattr->cf_uid = make_kuid(&init_user_ns, le64_to_cpu(info->Uid));
 
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID)
 		fattr->cf_gid = cifs_sb->mnt_gid;
 	else
-		fattr->cf_gid = le64_to_cpu(info->Gid);
+		fattr->cf_gid = make_kgid(&init_user_ns, le64_to_cpu(info->Gid));
 
 	fattr->cf_nlink = le64_to_cpu(info->Nlinks);
 }

@@ -1245,14 +1245,14 @@ cifs_mkdir_qinfo(struct inode *parent, struct dentry *dentry, umode_t mode,
 			.device	= 0,
 		};
 		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
-			args.uid = (__u64)current_fsuid();
-			if (parent->i_mode & S_ISGID)
-				args.gid = (__u64)parent->i_gid;
+			args.uid = current_fsuid();
+			if (inode->i_mode & S_ISGID)
+				args.gid = inode->i_gid;
 			else
-				args.gid = (__u64)current_fsgid();
+				args.gid = current_fsgid();
 		} else {
-			args.uid = NO_CHANGE_64;
-			args.gid = NO_CHANGE_64;
+			args.uid = INVALID_UID;
+			args.gid = INVALID_GID;
 		}
 		CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args,
 				       cifs_sb->local_nls,

@@ -2012,12 +2012,12 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
 	if (attrs->ia_valid & ATTR_UID)
 		args->uid = attrs->ia_uid;
 	else
-		args->uid = NO_CHANGE_64;
+		args->uid = NO_CHANGE_UID;
 
 	if (attrs->ia_valid & ATTR_GID)
 		args->gid = attrs->ia_gid;
 	else
-		args->gid = NO_CHANGE_64;
+		args->gid = NO_CHANGE_GID;
 
 	if (attrs->ia_valid & ATTR_ATIME)
 		args->atime = cifs_UnixTimeToNT(attrs->ia_atime);

@@ -2085,8 +2085,8 @@ static int
 cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
 {
 	unsigned int xid;
-	uid_t uid = NO_CHANGE_32;
-	gid_t gid = NO_CHANGE_32;
+	kuid_t uid = NO_CHANGE_UID;
+	kgid_t gid = NO_CHANGE_GID;
 	struct inode *inode = direntry->d_inode;
 	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
 	struct cifsInodeInfo *cifsInode = CIFS_I(inode);

@@ -2145,7 +2145,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
 
 #ifdef CONFIG_CIFS_ACL
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
-		if (uid != NO_CHANGE_32 || gid != NO_CHANGE_32) {
+		if (!uid_eq(uid, NO_CHANGE_UID) || !gid_eq(gid, NO_CHANGE_GID)) {
 			rc = id_mode_to_cifs_acl(inode, full_path, NO_CHANGE_64,
 							uid, gid);
 			if (rc) {

@@ -2169,7 +2169,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
 #ifdef CONFIG_CIFS_ACL
 		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
 			rc = id_mode_to_cifs_acl(inode, full_path, mode,
-						NO_CHANGE_32, NO_CHANGE_32);
+						NO_CHANGE_UID, NO_CHANGE_GID);
 			if (rc) {
 				cFYI(1, "%s: Setting ACL failed with error: %d",
 					__func__, rc);

fs/cifs/misc.c +1 -1

index 3a00c0d..1b15bf8 100644
@@ -569,7 +569,7 @@ bool
 backup_cred(struct cifs_sb_info *cifs_sb)
 {
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPUID) {
-		if (cifs_sb->mnt_backupuid == current_fsuid())
+		if (uid_eq(cifs_sb->mnt_backupuid, current_fsuid()))
 			return true;
 	}
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_BACKUPGID) {

init/Kconfig +0 -0

index cb2c46a..58959ea 100644