KVM: x86: Virtualize debug registers

[linux.git] / fs / nfsd / auth.c

diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
index 0184fe9b514cc2dbdb1b50c15900f927272c5fd3..5573508f707fa5cd652da4503049fa6e89c0f9f8 100644 (file)
--- a/fs/nfsd/auth.c
+++ b/fs/nfsd/auth.c
@@ -49,6 +49,8 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
                new->fsuid = exp->ex_anon_uid;
                new->fsgid = exp->ex_anon_gid;
                gi = 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) {
                if (!new->fsuid)
                        new->fsuid = exp->ex_anon_uid;
        } else if (flags & NFSEXP_ROOTSQUASH) {
                if (!new->fsuid)
                        new->fsuid = exp->ex_anon_uid;


@@ -76,15 +78,16 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
 
        ret = set_groups(new, gi);
        put_group_info(gi);
 
        ret = set_groups(new, gi);
        put_group_info(gi);

-       if (!ret)
+       if (ret < 0)

                goto error;
 
                goto error;
 

-       if (new->uid)
+       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);
        put_cred(override_creds(new));
                new->cap_effective = cap_drop_nfsd_set(new->cap_effective);
        else
                new->cap_effective = cap_raise_nfsd_set(new->cap_effective,
                                                        new->cap_permitted);
        put_cred(override_creds(new));

+       put_cred(new);

        return 0;
 
 oom:
        return 0;
 
 oom: