Merge branch 'for-3.9' 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 eb2b1f74d05416cd50e25d4517c8284d4d7000cf..f7d34e7b6f818ba52bec46795b83062cbdf5a71e 100644 (file)
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -412,6 +412,7 @@ static int rsc_parse(struct cache_detail *cd,
 {
        /* contexthandle expiry [ uid gid N <n gids> mechname ...mechdata... ] */
        char *buf = mesg;
+       int id;
        int len, rv;
        struct rsc rsci, *rscp = NULL;
        time_t expiry;
@@ -438,7 +439,7 @@ static int rsc_parse(struct cache_detail *cd,
                goto out;
 
        /* uid, or NEGATIVE */
-       rv = get_int(&mesg, &rsci.cred.cr_uid);
+       rv = get_int(&mesg, &id);
        if (rv == -EINVAL)
                goto out;
        if (rv == -ENOENT)
@@ -446,8 +447,16 @@ static int rsc_parse(struct cache_detail *cd,
        else {
                int N, i;
 
+               /* uid */
+               rsci.cred.cr_uid = make_kuid(&init_user_ns, id);
+               if (!uid_valid(rsci.cred.cr_uid))
+                       goto out;
+
                /* gid */
-               if (get_int(&mesg, &rsci.cred.cr_gid))
+               if (get_int(&mesg, &id))
+                       goto out;
+               rsci.cred.cr_gid = make_kgid(&init_user_ns, id);
+               if (!gid_valid(rsci.cred.cr_gid))
                        goto out;
 
                /* number of additional gid's */
@@ -461,11 +470,10 @@ static int rsc_parse(struct cache_detail *cd,
                /* gid's */
                status = -EINVAL;
                for (i=0; i<N; i++) {
-                       gid_t gid;
                        kgid_t kgid;
-                       if (get_int(&mesg, &gid))
+                       if (get_int(&mesg, &id))
                                goto out;
-                       kgid = make_kgid(&init_user_ns, gid);
+                       kgid = make_kgid(&init_user_ns, id);
                        if (!gid_valid(kgid))
                                goto out;
                        GROUP_AT(rsci.cred.cr_group_info, i) = kgid;