From: Mike Snitzer <snitzer@kernel.org>
To: linux-nfs@vger.kernel.org
Cc: Jeff Layton <jlayton@kernel.org>,
Chuck Lever <chuck.lever@oracle.com>,
Trond Myklebust <trondmy@hammerspace.com>,
NeilBrown <neilb@suse.de>,
snitzer@hammerspace.com
Subject: [PATCH v3 18/18] nfsd/localio: use nfsd_serv_get/put in nfsd_open_local_fh
Date: Thu, 13 Jun 2024 23:44:26 -0400 [thread overview]
Message-ID: <20240614034426.31043-19-snitzer@kernel.org> (raw)
In-Reply-To: <20240614034426.31043-1-snitzer@kernel.org>
Use nfsd_serv_get to SRCU deference nn->nfsd_serv and pass the
resulting svc_serv to nfsd_local_fakerqst_create, open the file handle
and then drop the reference using nfsd_serv_put at the end of
nfsd_open_local_fh.
Verified to fix an easy to hit crash that would occur if an nfsd
instance running in a container, with a localio client mounted, is
shutdown. Upon restart of the container and associated nfsd the client
would go on to crash due to NULL pointer dereference that occuured due
to the nfs client's localio attempting to nfsd_open_local_fh(), using
nn->nfsd_serv, without having a proper reference on nn->nfsd_serv.
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
---
fs/nfsd/localio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/nfsd/localio.c b/fs/nfsd/localio.c
index cdf8e115b33e..d1d9fbaab82e 100644
--- a/fs/nfsd/localio.c
+++ b/fs/nfsd/localio.c
@@ -193,6 +193,7 @@ int nfsd_open_local_fh(struct net *net,
struct nfsd_file *nf;
int status = 0;
int mayflags = NFSD_MAY_LOCALIO;
+ int srcu_idx;
struct svc_serv *serv;
__be32 beres;
@@ -207,7 +208,7 @@ int nfsd_open_local_fh(struct net *net,
}
nn = net_generic(net, nfsd_net_id);
- serv = READ_ONCE(nn->nfsd_serv);
+ serv = nfsd_serv_get(nn, &srcu_idx);
if (unlikely(!serv)) {
dprintk("%s: localio denied. Server not running\n", __func__);
status = -ENXIO;
@@ -247,6 +248,7 @@ int nfsd_open_local_fh(struct net *net,
out_revertcred:
revert_creds(save_cred);
out_net:
+ nfsd_serv_put(nn, srcu_idx);
put_net(net);
return status;
}
--
2.44.0
prev parent reply other threads:[~2024-06-14 3:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-14 3:44 [PATCH v3 00/18] nfs/nfsd: add support for localio Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 01/18] nfs: pass nfs_client to nfs_initiate_pgio Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 02/18] nfs: pass descriptor thru nfs_initiate_pgio path Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 03/18] nfs: pass struct file to nfs_init_pgio and nfs_init_commit Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 04/18] sunrpc: add rpcauth_map_to_svc_cred_local Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 05/18] nfs_common: add NFS LOCALIO protocol extension enablement Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 06/18] nfs/nfsd: add "localio" support Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 07/18] NFS: for localio don't call filesystem read() and write() routines directly Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 08/18] NFS: Enable localio for non-pNFS I/O Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 09/18] pnfs/flexfiles: Enable localio for flexfiles I/O Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 10/18] nfs: implement v3 and v4 client support for NFS_LOCALIO_PROGRAM Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 11/18] nfsd: implement v3 and v4 server " Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 12/18] nfs/nfsd: consolidate {encode,decode}_opaque_fixed in nfs_xdr.h Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 13/18] nfs/localio: move managing nfsd_open_local_fh symbol to nfs_common Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 14/18] nfs/nfsd: ensure localio server always uses its network namespace Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 15/18] nfsd/localio: manage netns reference in nfsd_open_local_fh Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 16/18] nfsd: prepare to use SRCU to dereference nn->nfsd_serv Mike Snitzer
2024-06-14 3:44 ` [PATCH v3 17/18] nfsd: " Mike Snitzer
2024-06-14 3:44 ` Mike Snitzer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240614034426.31043-19-snitzer@kernel.org \
--to=snitzer@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=jlayton@kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.de \
--cc=snitzer@hammerspace.com \
--cc=trondmy@hammerspace.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox