Re: 2.6.2-rc2-mm2
From: Andrew Morton (akpm_at_osdl.org)
Date: 01/31/04
- Previous message: Bartlomiej Zolnierkiewicz: "Re: The survival of ide-scsi in 2.6.x"
- In reply to: Tim Hockin: "Re: 2.6.2-rc2-mm2"
- Next in thread: Tim Hockin: "Re: 2.6.2-rc2-mm2"
- Reply: Tim Hockin: "Re: 2.6.2-rc2-mm2"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Fri, 30 Jan 2004 15:31:49 -0800 To: thockin@sun.com
Tim Hockin <thockin@sun.com> wrote:
>
> > + struct group_info *group_info = NULL;
>
> Why init to NULL?
leftovers.
> > + ngroups = 0;
> > + if (!(exp->ex_flags & NFSEXP_ALLSQUASH)) {
> > + for (i = 0; i < SVC_CRED_NGROUPS; i++) {
> > + if (cred->cr_groups[i])
> > + ngroups++;
> > + }
> > + }
>
> I though of doing this, but passed in favor of simplicity of patch :)
>
> The original made a specific point of doing
> gid_t group = cred->cr_groups[i];
> if (group == (gid_t) NOGROUP)
> break;
>
> So the count loop should probably be
> ngroups = 0;
> if (!(exp->ex_flags & NFSEXP_ALLSQUASH)) {
> for (i = 0; i < SVC_CRED_NGROUPS; i++) {
> gid_t group = cred->cr_groups[i];
> if (group == (gid_t) NOGROUP)
> break;
> ngroups++;
> }
> }
> So that we don't assume anything about NOGROUP.
yes, thanks.
> > + return ret;
>
> The caller in fs/nfsd/nfsfh.c still needs to check the return value and do
> something with it, or all this is just dumb.
We can add that to Neil's todo list ;)
diff -puN fs/nfsd/auth.c~increase-NGROUPS-nfsd-cleanup-checks fs/nfsd/auth.c
--- 25/fs/nfsd/auth.c~increase-NGROUPS-nfsd-cleanup-checks Fri Jan 30 15:03:55 2004
+++ 25-akpm/fs/nfsd/auth.c Fri Jan 30 15:28:36 2004
@@ -11,13 +11,26 @@
#include <linux/nfsd/nfsd.h>
#define CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))
-void
-nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
+
+int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
{
struct svc_cred *cred = &rqstp->rq_cred;
- int i, j;
- gid_t groups[SVC_CRED_NGROUPS];
struct group_info *group_info;
+ int ngroups;
+ int i;
+ int ret;
+
+ ngroups = 0;
+ if (!(exp->ex_flags & NFSEXP_ALLSQUASH)) {
+ for (i = 0; i < SVC_CRED_NGROUPS; i++) {
+ if (cred->cr_groups[i] == (gid_t)NOGROUP)
+ break;
+ ngroups++;
+ }
+ }
+ group_info = groups_alloc(ngroups);
+ if (group_info == NULL)
+ return -ENOMEM;
if (exp->ex_flags & NFSEXP_ALLSQUASH) {
cred->cr_uid = exp->ex_anon_uid;
@@ -41,25 +54,24 @@ nfsd_setuser(struct svc_rqst *rqstp, str
current->fsgid = cred->cr_gid;
else
current->fsgid = exp->ex_anon_gid;
+
for (i = 0; i < SVC_CRED_NGROUPS; i++) {
gid_t group = cred->cr_groups[i];
if (group == (gid_t) NOGROUP)
break;
- groups[i] = group;
+ GROUP_AT(group_info, i) = group;
}
- group_info = groups_alloc(i);
- /* should be error checking, but we can't return ENOMEM! */
- for (j = 0; j < i; j++)
- GROUP_AT(group_info, j) = groups[j];
- if (set_current_groups(group_info))
- put_group_info(group_info);
- /* should be error handling but we return void */
- if ((cred->cr_uid)) {
- cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
+ ret = set_current_groups(group_info);
+ if (ret == 0) {
+ if ((cred->cr_uid)) {
+ cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
+ } else {
+ cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
+ current->cap_permitted);
+ }
} else {
- cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
- current->cap_permitted);
+ put_group_info(group_info);
}
-
+ return ret;
}
diff -puN include/linux/nfsd/auth.h~increase-NGROUPS-nfsd-cleanup-checks include/linux/nfsd/auth.h
--- 25/include/linux/nfsd/auth.h~increase-NGROUPS-nfsd-cleanup-checks Fri Jan 30 15:03:55 2004
+++ 25-akpm/include/linux/nfsd/auth.h Fri Jan 30 15:03:55 2004
@@ -21,7 +21,7 @@
* Set the current process's fsuid/fsgid etc to those of the NFS
* client user
*/
-void nfsd_setuser(struct svc_rqst *, struct svc_export *);
+int nfsd_setuser(struct svc_rqst *, struct svc_export *);
#endif /* __KERNEL__ */
#endif /* LINUX_NFSD_AUTH_H */
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Previous message: Bartlomiej Zolnierkiewicz: "Re: The survival of ide-scsi in 2.6.x"
- In reply to: Tim Hockin: "Re: 2.6.2-rc2-mm2"
- Next in thread: Tim Hockin: "Re: 2.6.2-rc2-mm2"
- Reply: Tim Hockin: "Re: 2.6.2-rc2-mm2"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
|
