diff options
| author | Eric W. Biederman | 2013-02-02 11:45:08 +0100 |
|---|---|---|
| committer | Eric W. Biederman | 2013-02-13 15:15:24 +0100 |
| commit | a570abbb966ee7de6c4357a58be11a558fa7099b (patch) | |
| tree | d0102989aaa56cbd39266f416042df50f754d997 /net/sunrpc/auth_unix.c | |
| parent | sunrpc: Hash uids by first computing their value in the initial userns (diff) | |
| download | kernel-qcow2-linux-a570abbb966ee7de6c4357a58be11a558fa7099b.tar.gz kernel-qcow2-linux-a570abbb966ee7de6c4357a58be11a558fa7099b.tar.xz kernel-qcow2-linux-a570abbb966ee7de6c4357a58be11a558fa7099b.zip | |
sunrpc: Properly encode kuids and kgids in RPC_AUTH_UNIX credentials
When writing kuids onto the wire first map them into the initial user
namespace.
When writing kgids onto the wire first map them into the initial user
namespace.
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'net/sunrpc/auth_unix.c')
| -rw-r--r-- | net/sunrpc/auth_unix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c index c434fde2079b..dc37021fc3e5 100644 --- a/net/sunrpc/auth_unix.c +++ b/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 */ |