4 files changed, 33 insertions, 11 deletions

diff --git a/net/sunrpc/auth_generic.c b/net/sunrpc/auth_generic.c
index 75762f34697..6ed6f201b02 100644
--- a/net/sunrpc/auth_generic.c
+++ b/net/sunrpc/auth_generic.c
@@ -160,8 +160,8 @@ generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags)
         if (gcred->acred.group_info->ngroups != acred->group_info->ngroups)
                 goto out_nomatch;
         for (i = 0; i < gcred->acred.group_info->ngroups; i++) {
-                if (GROUP_AT(gcred->acred.group_info, i) !=
-                                GROUP_AT(acred->group_info, i))
+                if (!gid_eq(GROUP_AT(gcred->acred.group_info, i),
+                                GROUP_AT(acred->group_info, i)))
                         goto out_nomatch;
         }
 out_match:
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 1600cfb1618..28b62dbb6d1 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -41,6 +41,7 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pagemap.h>
+#include <linux/user_namespace.h>
 
 #include <linux/sunrpc/auth_gss.h>
 #include <linux/sunrpc/gss_err.h>
@@ -470,9 +471,13 @@ static int rsc_parse(struct cache_detail *cd,
                 status = -EINVAL;
                 for (i=0; i<N; i++) {
                         gid_t gid;
+                        kgid_t kgid;
                         if (get_int(&mesg, &gid))
                                 goto out;
-                        GROUP_AT(rsci.cred.cr_group_info, i) = gid;
+                        kgid = make_kgid(&init_user_ns, gid);
+                        if (!gid_valid(kgid))
+                                goto out;
+                        GROUP_AT(rsci.cred.cr_group_info, i) = kgid;
                 }
 
                 /* mech name */
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index e50502d8ceb..52c5abdee21 100644
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/auth.h>
+#include <linux/user_namespace.h>
 
 #define NFS_NGROUPS     16
 
@@ -78,8 +79,11 @@ unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
                 groups = NFS_NGROUPS;
 
         cred->uc_gid = acred->gid;
-        for (i = 0; i < groups; i++)
-                cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
+        for (i = 0; i < groups; i++) {
+                gid_t gid;
+                gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i));
+                cred->uc_gids[i] = gid;
+        }
         if (i < NFS_NGROUPS)
                 cred->uc_gids[i] = NOGROUP;
 
@@ -126,9 +130,12 @@ unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
                 groups = acred->group_info->ngroups;
         if (groups > NFS_NGROUPS)
                 groups = NFS_NGROUPS;
-        for (i = 0; i < groups ; i++)
-                if (cred->uc_gids[i] != GROUP_AT(acred->group_info, i))
+        for (i = 0; i < groups ; i++) {
+                gid_t gid;
+                gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i));
+                if (cred->uc_gids[i] != gid)
                         return 0;
+        }
         if (groups < NFS_NGROUPS &&
             cred->uc_gids[groups] != NOGROUP)
                 return 0;
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 521d8f7dc83..71ec8530ec8 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -14,6 +14,7 @@
 #include <net/sock.h>
 #include <net/ipv6.h>
 #include <linux/kernel.h>
+#include <linux/user_namespace.h>
 #define RPCDBG_FACILITY RPCDBG_AUTH
 
 #include <linux/sunrpc/clnt.h>
@@ -530,11 +531,15 @@ static int unix_gid_parse(struct cache_detail *cd,
 
         for (i = 0 ; i < gids ; i++) {
                 int gid;
+                kgid_t kgid;
                 rv = get_int(&mesg, &gid);
                 err = -EINVAL;
                 if (rv)
                         goto out;
-                GROUP_AT(ug.gi, i) = gid;
+                kgid = make_kgid(&init_user_ns, gid);
+                if (!gid_valid(kgid))
+                        goto out;
+                GROUP_AT(ug.gi, i) = kgid;
         }
 
         ugp = unix_gid_lookup(cd, uid);
@@ -563,6 +568,7 @@ static int unix_gid_show(struct seq_file *m,
                          struct cache_detail *cd,
                          struct cache_head *h)
 {
+        struct user_namespace *user_ns = current_user_ns();
         struct unix_gid *ug;
         int i;
         int glen;
@@ -580,7 +586,7 @@ static int unix_gid_show(struct seq_file *m,
 
         seq_printf(m, "%u %d:", ug->uid, glen);
         for (i = 0; i < glen; i++)
-                seq_printf(m, " %d", GROUP_AT(ug->gi, i));
+                seq_printf(m, " %d", from_kgid_munged(user_ns, GROUP_AT(ug->gi, i)));
         seq_printf(m, "\n");
         return 0;
 }
@@ -831,8 +837,12 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp)
         cred->cr_group_info = groups_alloc(slen);
         if (cred->cr_group_info == NULL)
                 return SVC_CLOSE;
-        for (i = 0; i < slen; i++)
-                GROUP_AT(cred->cr_group_info, i) = svc_getnl(argv);
+        for (i = 0; i < slen; i++) {
+                kgid_t kgid = make_kgid(&init_user_ns, svc_getnl(argv));
+                if (!gid_valid(kgid))
+                        goto badcred;
+                GROUP_AT(cred->cr_group_info, i) = kgid;
+        }
         if (svc_getu32(argv) != htonl(RPC_AUTH_NULL) || svc_getu32(argv) != 0) {
                 *authp = rpc_autherr_badverf;
                 return SVC_DENIED;