Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / sunrpc / auth_gss / svcauth_gss.c

diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index bcb773781ec08cbf0a2f00a4034126bfffc7e1cb..73e95738660042e7a9d4e7cb252143ec74078265 100644 (file)
--- 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>
@@ -467,9 +468,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 */