1 files changed, 8 insertions, 6 deletions

diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index 1e51e7034a89..4201ede0ec91 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -100,12 +100,14 @@ decode_sattr(__be32 *p, struct iattr *iap)
                 iap->ia_mode = tmp;
         }
         if ((tmp = ntohl(*p++)) != (u32)-1) {
-                iap->ia_valid |= ATTR_UID;
-                iap->ia_uid = tmp;
+                iap->ia_uid = make_kuid(&init_user_ns, tmp);
+                if (uid_valid(iap->ia_uid))
+                        iap->ia_valid |= ATTR_UID;
         }
         if ((tmp = ntohl(*p++)) != (u32)-1) {
-                iap->ia_valid |= ATTR_GID;
-                iap->ia_gid = tmp;
+                iap->ia_gid = make_kgid(&init_user_ns, tmp);
+                if (gid_valid(iap->ia_gid))
+                        iap->ia_valid |= ATTR_GID;
         }
         if ((tmp = ntohl(*p++)) != (u32)-1) {
                 iap->ia_valid |= ATTR_SIZE;
@@ -151,8 +153,8 @@ encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp,
         *p++ = htonl(nfs_ftypes[type >> 12]);
         *p++ = htonl((u32) stat->mode);
         *p++ = htonl((u32) stat->nlink);
-        *p++ = htonl((u32) stat->uid);
-        *p++ = htonl((u32) stat->gid);
+        *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid));
+        *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid));
 
         if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
                 *p++ = htonl(NFS_MAXPATHLEN);