nfsd4: reshuffle lease-setting code to allow reuse

[safe/jmp/linux-2.6] / fs / nfsd / auth.c

diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
index 808fc03..79717a4 100644 (file)
--- a/fs/nfsd/auth.c
+++ b/fs/nfsd/auth.c
@@ -1,15 +1,7 @@
-/*
- * linux/fs/nfsd/auth.c
- *
- * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
- */
+/* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
 
-#include <linux/types.h>
 #include <linux/sched.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/sunrpc/svcauth.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/export.h>
+#include "nfsd.h"
 #include "auth.h"
 
 int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)
@@ -27,55 +19,77 @@ int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)
 
 int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
 {
-       struct cred *act_as = current->cred ;
-       struct svc_cred cred = rqstp->rq_cred;
+       struct group_info *rqgi;
+       struct group_info *gi;
+       struct cred *new;
        int i;
        int flags = nfsexp_flags(rqstp, exp);
        int ret;
 
+       validate_process_creds();
+
+       /* discard any old override before preparing the new set */
+       revert_creds(get_cred(current->real_cred));
+       new = prepare_creds();
+       if (!new)
+               return -ENOMEM;
+
+       new->fsuid = rqstp->rq_cred.cr_uid;
+       new->fsgid = rqstp->rq_cred.cr_gid;
+
+       rqgi = rqstp->rq_cred.cr_group_info;
+
        if (flags & NFSEXP_ALLSQUASH) {
-               cred.cr_uid = exp->ex_anon_uid;
-               cred.cr_gid = exp->ex_anon_gid;
-               cred.cr_group_info = groups_alloc(0);
+               new->fsuid = exp->ex_anon_uid;
+               new->fsgid = exp->ex_anon_gid;
+               gi = groups_alloc(0);
+               if (!gi)
+                       goto oom;
        } else if (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 (gi)
-                       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);
-                       }
-               cred.cr_group_info = gi;
-       } else
-               get_group_info(cred.cr_group_info);
-
-       if (cred.cr_uid != (uid_t) -1)
-               act_as->fsuid = cred.cr_uid;
-       else
-               act_as->fsuid = exp->ex_anon_uid;
-       if (cred.cr_gid != (gid_t) -1)
-               act_as->fsgid = cred.cr_gid;
-       else
-               act_as->fsgid = exp->ex_anon_gid;
+               if (!new->fsuid)
+                       new->fsuid = exp->ex_anon_uid;
+               if (!new->fsgid)
+                       new->fsgid = exp->ex_anon_gid;
 
-       if (!cred.cr_group_info)
-               return -ENOMEM;
-       ret = set_groups(act_as, cred.cr_group_info);
-       put_group_info(cred.cr_group_info);
-       if ((cred.cr_uid)) {
-               act_as->cap_effective =
-                       cap_drop_nfsd_set(act_as->cap_effective);
+               gi = groups_alloc(rqgi->ngroups);
+               if (!gi)
+                       goto oom;
+
+               for (i = 0; i < rqgi->ngroups; i++) {
+                       if (!GROUP_AT(rqgi, i))
+                               GROUP_AT(gi, i) = exp->ex_anon_gid;
+                       else
+                               GROUP_AT(gi, i) = GROUP_AT(rqgi, i);
+               }
        } else {
-               act_as->cap_effective =
-                       cap_raise_nfsd_set(act_as->cap_effective,
-                                          act_as->cap_permitted);
+               gi = get_group_info(rqgi);
        }
+
+       if (new->fsuid == (uid_t) -1)
+               new->fsuid = exp->ex_anon_uid;
+       if (new->fsgid == (gid_t) -1)
+               new->fsgid = exp->ex_anon_gid;
+
+       ret = set_groups(new, gi);
+       put_group_info(gi);
+       if (ret < 0)
+               goto error;
+
+       if (new->fsuid)
+               new->cap_effective = cap_drop_nfsd_set(new->cap_effective);
+       else
+               new->cap_effective = cap_raise_nfsd_set(new->cap_effective,
+                                                       new->cap_permitted);
+       validate_process_creds();
+       put_cred(override_creds(new));
+       put_cred(new);
+       validate_process_creds();
+       return 0;
+
+oom:
+       ret = -ENOMEM;
+error:
+       abort_creds(new);
        return ret;
 }