xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd: drop the nfsd_put helper

Browse Source 
[ Upstream commit 64e6304169f1e1f078e7f0798033f80a7fb0ea46 ]

It's not safe to call nfsd_put once nfsd_last_thread has been called, as
that function will zero out the nn->nfsd_serv pointer.

Drop the nfsd_put helper altogether and open-code the svc_put in its
callers instead. That allows us to not be reliant on the value of that
pointer when handling an error.

Fixes: 2a501f55cd64 ("nfsd: call nfsd_last_thread() before final nfsd_put()")
Reported-by: Zhi Li <yieli@redhat.com>
Cc: NeilBrown <neilb@suse.de>
Signed-off-by: Jeffrey Layton <jlayton@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jeff Layton
2024-01-03 08:36:52 -05:00
committed by Greg Kroah-Hartman
parent 838a602db7
commit ca791e1a31
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
fs/nfsd/nfsctl.c
View File

@@ -709,6 +709,7 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred
char *mesg = buf; char *mesg = buf;
int fd, err; int fd, err;
struct nfsd_net *nn = net_generic(net, nfsd_net_id); struct nfsd_net *nn = net_generic(net, nfsd_net_id);
struct svc_serv *serv;
err = get_int(&mesg, &fd); err = get_int(&mesg, &fd);
if (err != 0 || fd < 0) if (err != 0 || fd < 0)
@@ -718,15 +719,15 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred
if (err != 0) if (err != 0)
return err; return err;
err = svc_addsock(nn->nfsd_serv, net, fd, buf, SIMPLE_TRANSACTION_LIMIT, cred); serv = nn->nfsd_serv;
err = svc_addsock(serv, net, fd, buf, SIMPLE_TRANSACTION_LIMIT, cred);
if (err < 0 && !nn->nfsd_serv->sv_nrthreads && !nn->keep_active) if (err < 0 && !serv->sv_nrthreads && !nn->keep_active)
nfsd_last_thread(net); nfsd_last_thread(net);
else if (err >= 0 && else if (err >= 0 && !serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
!nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1)) svc_get(serv);
svc_get(nn->nfsd_serv);
nfsd_put(net); svc_put(serv);
return err; return err;
} }
@@ -740,6 +741,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr
struct svc_xprt *xprt; struct svc_xprt *xprt;
int port, err; int port, err;
struct nfsd_net *nn = net_generic(net, nfsd_net_id); struct nfsd_net *nn = net_generic(net, nfsd_net_id);
struct svc_serv *serv;
if (sscanf(buf, "%15s %5u", transport, &port) != 2) if (sscanf(buf, "%15s %5u", transport, &port) != 2)
return -EINVAL; return -EINVAL;
@@ -751,32 +753,33 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr
if (err != 0) if (err != 0)
return err; return err;
err = svc_xprt_create(nn->nfsd_serv, transport, net, serv = nn->nfsd_serv;
err = svc_xprt_create(serv, transport, net,
PF_INET, port, SVC_SOCK_ANONYMOUS, cred); PF_INET, port, SVC_SOCK_ANONYMOUS, cred);
if (err < 0) if (err < 0)
goto out_err; goto out_err;
err = svc_xprt_create(nn->nfsd_serv, transport, net, err = svc_xprt_create(serv, transport, net,
PF_INET6, port, SVC_SOCK_ANONYMOUS, cred); PF_INET6, port, SVC_SOCK_ANONYMOUS, cred);
if (err < 0 && err != -EAFNOSUPPORT) if (err < 0 && err != -EAFNOSUPPORT)
goto out_close; goto out_close;
if (!nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1)) if (!serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
svc_get(nn->nfsd_serv); svc_get(serv);
nfsd_put(net); svc_put(serv);
return 0; return 0;
out_close: out_close:
xprt = svc_find_xprt(nn->nfsd_serv, transport, net, PF_INET, port); xprt = svc_find_xprt(serv, transport, net, PF_INET, port);
if (xprt != NULL) { if (xprt != NULL) {
svc_xprt_close(xprt); svc_xprt_close(xprt);
svc_xprt_put(xprt); svc_xprt_put(xprt);
} }
out_err: out_err:
if (!nn->nfsd_serv->sv_nrthreads && !nn->keep_active) if (!serv->sv_nrthreads && !nn->keep_active)
nfsd_last_thread(net); nfsd_last_thread(net);
nfsd_put(net); svc_put(serv);
return err; return err;
} }

7
fs/nfsd/nfsd.h
View File

@@ -96,13 +96,6 @@ int nfsd_pool_stats_open(struct inode *, struct file *);
int nfsd_pool_stats_release(struct inode *, struct file *); int nfsd_pool_stats_release(struct inode *, struct file *);
void nfsd_shutdown_threads(struct net *net); void nfsd_shutdown_threads(struct net *net);
static inline void nfsd_put(struct net *net)
{
struct nfsd_net *nn = net_generic(net, nfsd_net_id);
svc_put(nn->nfsd_serv);
}
bool i_am_nfsd(void); bool i_am_nfsd(void);
struct nfsdfs_client { struct nfsdfs_client {