@@ -191,6 +191,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;
@@ -205,7 +206,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;
@@ -245,6 +246,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;
}
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(-)