diff --git a/[refs] b/[refs]
index 9436ad16227a..87d960c9495f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce0cf6622c9a6f18c2723ea4bef7616799a1ca39
+refs/heads/master: bf935a78814cc9b96d09f612912178adc964ce9c
diff --git a/trunk/fs/nfsd/auth.c b/trunk/fs/nfsd/auth.c
index c903e04aa217..b860d3484cd7 100644
--- a/trunk/fs/nfsd/auth.c
+++ b/trunk/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;