GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 05:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nfsd4: don't try to map gid's in generic rpc code

Browse source 
For nfsd we provide users the option of mapping uid's to server-side
supplementary group lists.  That makes sense for nfsd, but not
necessarily for other rpc users (such as the callback client).

So move that lookup to svcauth_unix_set_client, which is a
program-specific method.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
J. Bruce Fields 2009-10-20 18:51:34 -04:00
parent efe0cb6d5a
commit dc83d6e27f
1 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

53
net/sunrpc/svcauth_unix.c
View file

@ -655,23 +655,25 @@ static struct unix_gid *unix_gid_lookup(uid_t uid)
return NULL; return NULL;
} }
static int unix_gid_find(uid_t uid, struct group_info **gip, static struct group_info *unix_gid_find(uid_t uid, struct svc_rqst *rqstp)
struct svc_rqst *rqstp)
{ {
struct unix_gid *ug = unix_gid_lookup(uid); struct unix_gid *ug;
struct group_info *gi;
int ret;
ug = unix_gid_lookup(uid);
if (!ug) if (!ug)
return -EAGAIN; return ERR_PTR(-EAGAIN);
switch (cache_check(&unix_gid_cache, &ug->h, &rqstp->rq_chandle)) { ret = cache_check(&unix_gid_cache, &ug->h, &rqstp->rq_chandle);
switch (ret) {
case -ENOENT: case -ENOENT:
*gip = NULL; return ERR_PTR(-ENOENT);
return 0;
case 0: case 0:
*gip = ug->gi; gi = get_group_info(ug->gi);
get_group_info(*gip);
cache_put(&ug->h, &unix_gid_cache); cache_put(&ug->h, &unix_gid_cache);
return 0; return gi;
default: default:
return -EAGAIN; return ERR_PTR(-EAGAIN);
} }
} }
@ -681,6 +683,8 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
struct sockaddr_in *sin; struct sockaddr_in *sin;
struct sockaddr_in6 *sin6, sin6_storage; struct sockaddr_in6 *sin6, sin6_storage;
struct ip_map *ipm; struct ip_map *ipm;
struct group_info *gi;
struct svc_cred *cred = &rqstp->rq_cred;
switch (rqstp->rq_addr.ss_family) { switch (rqstp->rq_addr.ss_family) {
case AF_INET: case AF_INET:
@ -722,6 +726,17 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
ip_map_cached_put(rqstp, ipm); ip_map_cached_put(rqstp, ipm);
break; break;
} }
gi = unix_gid_find(cred->cr_uid, rqstp);
switch (PTR_ERR(gi)) {
case -EAGAIN:
return SVC_DROP;
case -ENOENT:
break;
default:
put_group_info(cred->cr_group_info);
cred->cr_group_info = gi;
}
return SVC_OK; return SVC_OK;
} }
@ -818,19 +833,11 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp)
slen = svc_getnl(argv); /* gids length */ slen = svc_getnl(argv); /* gids length */
if (slen > 16 || (len -= (slen + 2)*4) < 0) if (slen > 16 || (len -= (slen + 2)*4) < 0)
goto badcred; goto badcred;
if (unix_gid_find(cred->cr_uid, &cred->cr_group_info, rqstp) cred->cr_group_info = groups_alloc(slen);
== -EAGAIN) if (cred->cr_group_info == NULL)
return SVC_DROP; return SVC_DROP;
if (cred->cr_group_info == NULL) { for (i = 0; i < slen; i++)
cred->cr_group_info = groups_alloc(slen); GROUP_AT(cred->cr_group_info, i) = svc_getnl(argv);
if (cred->cr_group_info == NULL)
return SVC_DROP;
for (i = 0; i < slen; i++)
GROUP_AT(cred->cr_group_info, i) = svc_getnl(argv);
} else {
for (i = 0; i < slen ; i++)
svc_getnl(argv);
}
if (svc_getu32(argv) != htonl(RPC_AUTH_NULL) || svc_getu32(argv) != 0) { if (svc_getu32(argv) != htonl(RPC_AUTH_NULL) || svc_getu32(argv) != 0) {
*authp = rpc_autherr_badverf; *authp = rpc_autherr_badverf;
return SVC_DENIED; return SVC_DENIED;