Skip to content
Snippets Groups Projects
Commit a570abbb authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

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: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 9e469e30
No related branches found
No related tags found
No related merge requests found
...@@ -157,11 +157,11 @@ unx_marshal(struct rpc_task *task, __be32 *p) ...@@ -157,11 +157,11 @@ unx_marshal(struct rpc_task *task, __be32 *p)
*/ */
p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen); p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
*p++ = htonl((u32) cred->uc_uid); *p++ = htonl((u32) from_kuid(&init_user_ns, cred->uc_uid));
*p++ = htonl((u32) cred->uc_gid); *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gid));
hold = p++; hold = p++;
for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++) 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 */ *hold = htonl(p - hold - 1); /* gid array length */
*base = htonl((p - base - 1) << 2); /* cred length */ *base = htonl((p - base - 1) << 2); /* cred length */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment