Merge branch 'linus' into x86/mm

Conflicts:
	arch/x86/mm/fault.c

1 files changed, 3 insertions, 0 deletions

diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
index c903e04aa217..5573508f707f 100644
--- 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);
+                if (!gi)
+                        goto oom;
         } else if (flags & NFSEXP_ROOTSQUASH) {
                 if (!new->fsuid)
                         new->fsuid = exp->ex_anon_uid;
@@ -85,6 +87,7 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
                 new->cap_effective = cap_raise_nfsd_set(new->cap_effective,
                                                         new->cap_permitted);
         put_cred(override_creds(new));
+        put_cred(new);
         return 0;
 
 oom: