nfsd: handle get_client_locked() failure in nfsd4_setclientid_confirm()

Lei Lu recently reported that nfsd4_setclientid_confirm() did not check
the return value from get_client_locked(). a SETCLIENTID_CONFIRM could
race with a confirmed client expiring and fail to get a reference. That
could later lead to a UAF.

Fix this by getting a reference early in the case where there is an
extant confirmed client. If that fails then treat it as if there were no
confirmed client found at all.

In the case where the unconfirmed client is expiring, just fail and
return the result from get_client_locked().

Reported-by: lei lu <llfamsec@gmail.com>
Closes: https://lore.kernel.org/linux-nfs/CAEBF3_b=UvqzNKdnfD_52L05Mqrqui9vZ2eFamgAbV0WG+FNWQ@mail.gmail.com/
Fixes: d20c11d86d8f ("nfsd: Protect session creation and client confirm using client_lock")
Cc: stable@vger.kernel.org
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index a0e3fa2718c7ef331925e9ba8f2a66f331c76db5..95d88555648d61d1053ade40f628b25c005531be 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4690,10 +4690,16 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
        }
        status = nfs_ok;
        if (conf) {
-               old = unconf;
-               unhash_client_locked(old);
-               nfsd4_change_callback(conf, &unconf->cl_cb_conn);
-       } else {
+               if (get_client_locked(conf) == nfs_ok) {
+                       old = unconf;
+                       unhash_client_locked(old);
+                       nfsd4_change_callback(conf, &unconf->cl_cb_conn);
+               } else {
+                       conf = NULL;
+               }
+       }
+
+       if (!conf) {
                old = find_confirmed_client_by_name(&unconf->cl_name, nn);
                if (old) {
                        status = nfserr_clid_inuse;
@@ -4710,10 +4716,14 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
                        }
                        trace_nfsd_clid_replaced(&old->cl_clientid);
                }
+               status = get_client_locked(unconf);
+               if (status != nfs_ok) {
+                       old = NULL;
+                       goto out;
+               }
                move_to_confirmed(unconf);
                conf = unconf;
        }
-       get_client_locked(conf);
        spin_unlock(&nn->client_lock);
        if (conf == unconf)
                fsnotify_dentry(conf->cl_nfsd_info_dentry, FS_MODIFY);