|
@@ -14,46 +14,46 @@
|
|
|
|
|
|
int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
|
|
|
{
|
|
|
- struct svc_cred *cred = &rqstp->rq_cred;
|
|
|
+ struct svc_cred cred = rqstp->rq_cred;
|
|
|
int i;
|
|
|
int ret;
|
|
|
|
|
|
if (exp->ex_flags & NFSEXP_ALLSQUASH) {
|
|
|
- cred->cr_uid = exp->ex_anon_uid;
|
|
|
- cred->cr_gid = exp->ex_anon_gid;
|
|
|
- put_group_info(cred->cr_group_info);
|
|
|
- cred->cr_group_info = groups_alloc(0);
|
|
|
+ cred.cr_uid = exp->ex_anon_uid;
|
|
|
+ cred.cr_gid = exp->ex_anon_gid;
|
|
|
+ cred.cr_group_info = groups_alloc(0);
|
|
|
} else if (exp->ex_flags & NFSEXP_ROOTSQUASH) {
|
|
|
struct group_info *gi;
|
|
|
- if (!cred->cr_uid)
|
|
|
- cred->cr_uid = exp->ex_anon_uid;
|
|
|
- if (!cred->cr_gid)
|
|
|
- cred->cr_gid = exp->ex_anon_gid;
|
|
|
- gi = groups_alloc(cred->cr_group_info->ngroups);
|
|
|
+ if (!cred.cr_uid)
|
|
|
+ cred.cr_uid = exp->ex_anon_uid;
|
|
|
+ if (!cred.cr_gid)
|
|
|
+ cred.cr_gid = exp->ex_anon_gid;
|
|
|
+ gi = groups_alloc(cred.cr_group_info->ngroups);
|
|
|
if (gi)
|
|
|
- for (i = 0; i < cred->cr_group_info->ngroups; i++) {
|
|
|
- if (!GROUP_AT(cred->cr_group_info, i))
|
|
|
+ for (i = 0; i < cred.cr_group_info->ngroups; i++) {
|
|
|
+ if (!GROUP_AT(cred.cr_group_info, i))
|
|
|
GROUP_AT(gi, i) = exp->ex_anon_gid;
|
|
|
else
|
|
|
- GROUP_AT(gi, i) = GROUP_AT(cred->cr_group_info, i);
|
|
|
+ GROUP_AT(gi, i) = GROUP_AT(cred.cr_group_info, i);
|
|
|
}
|
|
|
- put_group_info(cred->cr_group_info);
|
|
|
- cred->cr_group_info = gi;
|
|
|
- }
|
|
|
+ cred.cr_group_info = gi;
|
|
|
+ } else
|
|
|
+ get_group_info(cred.cr_group_info);
|
|
|
|
|
|
- if (cred->cr_uid != (uid_t) -1)
|
|
|
- current->fsuid = cred->cr_uid;
|
|
|
+ if (cred.cr_uid != (uid_t) -1)
|
|
|
+ current->fsuid = cred.cr_uid;
|
|
|
else
|
|
|
current->fsuid = exp->ex_anon_uid;
|
|
|
- if (cred->cr_gid != (gid_t) -1)
|
|
|
- current->fsgid = cred->cr_gid;
|
|
|
+ if (cred.cr_gid != (gid_t) -1)
|
|
|
+ current->fsgid = cred.cr_gid;
|
|
|
else
|
|
|
current->fsgid = exp->ex_anon_gid;
|
|
|
|
|
|
- if (!cred->cr_group_info)
|
|
|
+ if (!cred.cr_group_info)
|
|
|
return -ENOMEM;
|
|
|
- ret = set_current_groups(cred->cr_group_info);
|
|
|
- if ((cred->cr_uid)) {
|
|
|
+ ret = set_current_groups(cred.cr_group_info);
|
|
|
+ put_group_info(cred.cr_group_info);
|
|
|
+ if ((cred.cr_uid)) {
|
|
|
cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
|
|
|
} else {
|
|
|
cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
|