From a689ef937308e481ab683455e3b0de8c91f20b1f Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Sat, 2 Feb 2013 02:45:08 -0800 Subject: [PATCH] --- yaml --- r: 357811 b: refs/heads/master c: a570abbb966ee7de6c4357a58be11a558fa7099b h: refs/heads/master i: 357809: cb1ea57e157a401ff7c887f0abc9494a4744e8fa 357807: e851bceda75bae73d1ccc9c6d832001c253b4f83 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/auth_unix.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 212905269a8f..2e3ed23f53f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e469e30d712b54cd3ff4a82d4dd5510522b8f16 +refs/heads/master: a570abbb966ee7de6c4357a58be11a558fa7099b diff --git a/trunk/net/sunrpc/auth_unix.c b/trunk/net/sunrpc/auth_unix.c index c434fde2079b..dc37021fc3e5 100644 --- a/trunk/net/sunrpc/auth_unix.c +++ b/trunk/net/sunrpc/auth_unix.c @@ -157,11 +157,11 @@ unx_marshal(struct rpc_task *task, __be32 *p) */ p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen); - *p++ = htonl((u32) cred->uc_uid); - *p++ = htonl((u32) cred->uc_gid); + *p++ = htonl((u32) from_kuid(&init_user_ns, cred->uc_uid)); + *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gid)); hold = p++; for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++) - *p++ = htonl((u32) cred->uc_gids[i]); + *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i])); *hold = htonl(p - hold - 1); /* gid array length */ *base = htonl((p - base - 1) << 2); /* cred length */