1 files changed, 4 insertions, 1 deletions

diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
index 836ffa1047d9..0184fe9b514c 100644
--- a/fs/nfsd/auth.c
+++ b/fs/nfsd/auth.c
@@ -34,6 +34,8 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
         int flags = nfsexp_flags(rqstp, exp);
         int ret;
 
+        /* discard any old override before preparing the new set */
+        revert_creds(get_cred(current->real_cred));
         new = prepare_creds();
         if (!new)
                 return -ENOMEM;
@@ -82,7 +84,8 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
         else
                 new->cap_effective = cap_raise_nfsd_set(new->cap_effective,
                                                         new->cap_permitted);
-        return commit_creds(new);
+        put_cred(override_creds(new));
+        return 0;
 
 oom:
         ret = -ENOMEM;