Merge tag 'nfsd-6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

Pull nfsd fixes from Chuck Lever:

 - Fix a filecache UAF during NFSD shutdown

 - Avoid exposing automounted mounts on NFS re-exports

* tag 'nfsd-6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: fix handling of readdir in v4root vs. mount upcall timeout
  nfsd: shut down the NFSv4 state objects before the filecache

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 2b4ae85..ebb4d02 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3629,6 +3629,17 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen,
        case nfserr_noent:
                xdr_truncate_encode(xdr, start_offset);
                goto skip_entry;
+       case nfserr_jukebox:
+               /*
+                * The pseudoroot should only display dentries that lead to
+                * exports. If we get EJUKEBOX here, then we can't tell whether
+                * this entry should be included. Just fail the whole READDIR
+                * with NFS4ERR_DELAY in that case, and hope that the situation
+                * will resolve itself by the client's next attempt.
+                */
+               if (cd->rd_fhp->fh_export->ex_flags & NFSEXP_V4ROOT)
+                       goto fail;
+               fallthrough;
        default:
                /*
                 * If the client requested the RDATTR_ERROR attribute,

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 56fba1c..325d3d3 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -453,8 +453,8 @@ static void nfsd_shutdown_net(struct net *net)
 {
        struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 
-       nfsd_file_cache_shutdown_net(net);
        nfs4_state_shutdown_net(net);
+       nfsd_file_cache_shutdown_net(net);
        if (nn->lockd_up) {
                lockd_down(net);
                nn->lockd_up = false;