nfsd: initialise nfsd_info.mutex early.

[ Upstream commit e0011bca603c101f2a3c007bdb77f7006fa78fb1 ]

nfsd_info.mutex can be dereferenced by svc_pool_stats_start()
immediately after the new netns is created.  Currently this can
trigger an oops.

Move the initialisation earlier before it can possibly be dereferenced.

Fixes: 7b207ccd9833 ("svc: don't hold reference for poolstats, only mutex.")
Reported-by: Sourabh Jain <sourabhjain@linux.ibm.com>
Closes: https://lore.kernel.org/all/c2e9f6de-1ec4-4d3a-b18d-d5a6ec0814a0@linux.ibm.com/
Signed-off-by: NeilBrown <neilb@suse.de>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 4d23bb1d08c0ab6fff16690555d5e7e9b35b33a2..332847daa1b41883f03c61365fab6eea9397fc54 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1679,6 +1679,8 @@ static __net_init int nfsd_net_init(struct net *net)
        nn->nfsd_svcstats.program = &nfsd_program;
        nn->nfsd_versions = NULL;
        nn->nfsd4_minorversions = NULL;
+       nn->nfsd_info.mutex = &nfsd_mutex;
+       nn->nfsd_serv = NULL;
        nfsd4_init_leases_net(nn);
        get_random_bytes(&nn->siphash_key, sizeof(nn->siphash_key));
        seqlock_init(&nn->writeverf_lock);

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index c0d17b92b249f7db6f084ad005d7eefd4a595fc7..f23b00cb9f631a508bf42b9e7f9481b6be26c394 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -673,7 +673,6 @@ int nfsd_create_serv(struct net *net)
                return error;
        }
        spin_lock(&nfsd_notifier_lock);
-       nn->nfsd_info.mutex = &nfsd_mutex;
        nn->nfsd_serv = serv;
        spin_unlock(&nfsd_notifier_lock);