git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
net
/
sunrpc
/
auth_unix.c
diff --git
a/net/sunrpc/auth_unix.c
b/net/sunrpc/auth_unix.c
index
33741fc
..
94b08dc
100644
(file)
--- a/
net/sunrpc/auth_unix.c
+++ b/
net/sunrpc/auth_unix.c
@@
-20,8
+20,10
@@
struct unx_cred {
struct rpc_cred uc_base;
gid_t uc_gid;
struct unx_cred {
struct rpc_cred uc_base;
gid_t uc_gid;
+ xid_t uc_xid;
uid_t uc_puid; /* process uid */
gid_t uc_pgid; /* process gid */
uid_t uc_puid; /* process uid */
gid_t uc_pgid; /* process gid */
+ xid_t uc_pxid; /* process xid */
gid_t uc_gids[NFS_NGROUPS];
};
#define uc_uid uc_base.cr_uid
gid_t uc_gids[NFS_NGROUPS];
};
#define uc_uid uc_base.cr_uid
@@
-81,6
+83,7
@@
unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
if (flags & RPC_TASK_ROOTCREDS) {
cred->uc_uid = cred->uc_puid = 0;
cred->uc_gid = cred->uc_pgid = 0;
if (flags & RPC_TASK_ROOTCREDS) {
cred->uc_uid = cred->uc_puid = 0;
cred->uc_gid = cred->uc_pgid = 0;
+ cred->uc_xid = cred->uc_pxid = vx_current_xid();
cred->uc_gids[0] = NOGROUP;
} else {
int groups = acred->group_info->ngroups;
cred->uc_gids[0] = NOGROUP;
} else {
int groups = acred->group_info->ngroups;
@@
-89,10
+92,10
@@
unx_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
cred->uc_uid = acred->uid;
cred->uc_gid = acred->gid;
cred->uc_uid = acred->uid;
cred->uc_gid = acred->gid;
-// cred->uc_puid = XIDINO_UID(current->uid, current->xid);
-// cred->uc_pgid = XIDINO_GID(current->gid, current->xid);
+ cred->uc_xid = acred->xid;
cred->uc_puid = current->uid;
cred->uc_pgid = current->gid;
cred->uc_puid = current->uid;
cred->uc_pgid = current->gid;
+ cred->uc_pxid = vx_current_xid();
for (i = 0; i < groups; i++)
cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
if (i < NFS_NGROUPS)
for (i = 0; i < groups; i++)
cred->uc_gids[i] = GROUP_AT(acred->group_info, i);
if (i < NFS_NGROUPS)
@@
-125,8
+128,10
@@
unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int taskflags)
if (cred->uc_uid != acred->uid
|| cred->uc_gid != acred->gid
if (cred->uc_uid != acred->uid
|| cred->uc_gid != acred->gid
- || cred->uc_puid != XIDINO_UID(current->uid, current->xid)
- || cred->uc_pgid != XIDINO_GID(current->gid, current->xid))
+ || cred->uc_xid != acred->xid
+ || cred->uc_puid != current->uid
+ || cred->uc_pgid != current->gid
+ || cred->uc_pxid != vx_current_xid())
return 0;
groups = acred->group_info->ngroups;
return 0;
groups = acred->group_info->ngroups;
@@
-152,7
+157,7
@@
unx_marshal(struct rpc_task *task, u32 *p, int ruid)
struct rpc_clnt *clnt = task->tk_client;
struct unx_cred *cred = (struct unx_cred *) task->tk_msg.rpc_cred;
u32 *base, *hold;
struct rpc_clnt *clnt = task->tk_client;
struct unx_cred *cred = (struct unx_cred *) task->tk_msg.rpc_cred;
u32 *base, *hold;
- int i;
+ int i
, tagxid
;
*p++ = htonl(RPC_AUTH_UNIX);
base = p++;
*p++ = htonl(RPC_AUTH_UNIX);
base = p++;
@@
-162,14
+167,19
@@
unx_marshal(struct rpc_task *task, u32 *p, int ruid)
* Copy the UTS nodename captured when the client was created.
*/
p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
* Copy the UTS nodename captured when the client was created.
*/
p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen);
+ tagxid = task->tk_client->cl_tagxid;
/* Note: we don't use real uid if it involves raising privilege */
if (ruid && cred->uc_puid != 0 && cred->uc_pgid != 0) {
/* Note: we don't use real uid if it involves raising privilege */
if (ruid && cred->uc_puid != 0 && cred->uc_pgid != 0) {
- *p++ = htonl((u32) cred->uc_puid);
- *p++ = htonl((u32) cred->uc_pgid);
+ *p++ = htonl((u32) XIDINO_UID(tagxid,
+ cred->uc_puid, cred->uc_pxid));
+ *p++ = htonl((u32) XIDINO_GID(tagxid,
+ cred->uc_pgid, cred->uc_pxid));
} else {
} else {
- *p++ = htonl((u32) cred->uc_uid);
- *p++ = htonl((u32) cred->uc_gid);
+ *p++ = htonl((u32) XIDINO_UID(tagxid,
+ cred->uc_uid, cred->uc_xid));
+ *p++ = htonl((u32) XIDINO_GID(tagxid,
+ cred->uc_gid, cred->uc_xid));
}
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
}
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
@@
-190,7
+200,7
@@
static int
unx_refresh(struct rpc_task *task)
{
task->tk_msg.rpc_cred->cr_flags |= RPCAUTH_CRED_UPTODATE;
unx_refresh(struct rpc_task *task)
{
task->tk_msg.rpc_cred->cr_flags |= RPCAUTH_CRED_UPTODATE;
- return
task->tk_status = -EACCES
;
+ return
0
;
}
static u32 *
}
static u32 *