SUNRPC: Use the client user namespace when encoding creds

[linux-2.6-microblaze.git] / net / sunrpc / auth_unix.c

diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index d4018e5..e7df1f7 100644 (file)
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -107,6 +107,8 @@ unx_marshal(struct rpc_task *task, struct xdr_stream *xdr)
        __be32          *p, *cred_len, *gidarr_len;
        int             i;
        struct group_info *gi = cred->cr_cred->group_info;
+       struct user_namespace *userns = clnt->cl_cred ?
+               clnt->cl_cred->user_ns : &init_user_ns;
 
        /* Credential */
 
@@ -122,14 +124,13 @@ unx_marshal(struct rpc_task *task, struct xdr_stream *xdr)
        p = xdr_reserve_space(xdr, 3 * sizeof(*p));
        if (!p)
                goto marshal_failed;
-       *p++ = cpu_to_be32(from_kuid(&init_user_ns, cred->cr_cred->fsuid));
-       *p++ = cpu_to_be32(from_kgid(&init_user_ns, cred->cr_cred->fsgid));
+       *p++ = cpu_to_be32(from_kuid_munged(userns, cred->cr_cred->fsuid));
+       *p++ = cpu_to_be32(from_kgid_munged(userns, cred->cr_cred->fsgid));
 
        gidarr_len = p++;
        if (gi)
                for (i = 0; i < UNX_NGROUPS && i < gi->ngroups; i++)
-                       *p++ = cpu_to_be32(from_kgid(&init_user_ns,
-                                                    gi->gid[i]));
+                       *p++ = cpu_to_be32(from_kgid_munged(userns, gi->gid[i]));
        *gidarr_len = cpu_to_be32(p - gidarr_len - 1);
        *cred_len = cpu_to_be32((p - cred_len - 1) << 2);
        p = xdr_reserve_space(xdr, (p - gidarr_len - 1) << 2);