| Message ID | 20231211-nfsd-fixes-v1-1-c87a802f4977@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | nfsd: properly tear down server when write_ports fails | expand |
On Tue, 12 Dec 2023, Jeff Layton wrote: > When the initial write to the "portlist" file fails, we'll currently put > the reference to the nn->nfsd_serv, but leave the pointer intact. This > leads to a UAF if someone tries to write to "portlist" again. > > Simple reproducer, from a host with nfsd shut down: > > # echo "foo 2049" > /proc/fs/nfsd/portlist > # echo "foo 2049" > /proc/fs/nfsd/portlist > > The kernel will oops on the second one when it trips over the dangling > nn->nfsd_serv pointer. There is a similar bug in __write_ports_addfd. > > This patch fixes it by adding some extra logic to nfsd_put to ensure > that nfsd_last_thread is called prior to putting the reference when the > conditions are right. > > Fixes: 9f28a971ee9f ("nfsd: separate nfsd_last_thread() from nfsd_put()") > Closes: https://issues.redhat.com/browse/RHEL-19081 > Reported-by: Zhi Li <yieli@redhat.com> > Signed-off-by: Jeff Layton <jlayton@kernel.org> > --- > This should probably go to stable, but we'll need to backport for v6.6 > since older kernels don't have nfsd_nl_rpc_status_get_done. We should > just be able to drop that hunk though. > --- > fs/nfsd/nfsctl.c | 32 ++++++++++++++++++++++++++++---- > fs/nfsd/nfsd.h | 8 +------- > fs/nfsd/nfssvc.c | 2 +- > 3 files changed, 30 insertions(+), 12 deletions(-) This is much the same as https://lore.kernel.org/linux-nfs/20231030011247.9794-2-neilb@suse.de/ It seems that didn't land. Maybe I dropped the ball... NeilBrown > > diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c > index 3e15b72f421d..1ceccf804e44 100644 > --- a/fs/nfsd/nfsctl.c > +++ b/fs/nfsd/nfsctl.c > @@ -61,6 +61,30 @@ enum { > NFSD_MaxReserved > }; > > +/** > + * nfsd_put - put the reference to the nfsd_serv for given net > + * @net: the net namespace for the serv > + * @err: current error for the op > + * > + * When putting a reference to the nfsd_serv from a control operation > + * we must first call nfsd_last_thread if all of these are true: > + * > + * - the configuration operation is going fail > + * - there are no running threads > + * - there are no successfully configured ports > + * > + * Otherwise, just put the serv reference. > + */ > +static inline void nfsd_put(struct net *net, int err) > +{ > + struct nfsd_net *nn = net_generic(net, nfsd_net_id); > + struct svc_serv *serv = nn->nfsd_serv; > + > + if (err < 0 && !nn->nfsd_serv->sv_nrthreads && !nn->keep_active) > + nfsd_last_thread(net); > + svc_put(serv); > +} > + > /* > * write() for these nodes. > */ > @@ -709,7 +733,7 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred > !nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1)) > svc_get(nn->nfsd_serv); > > - nfsd_put(net); > + nfsd_put(net, err); > return err; > } > > @@ -748,7 +772,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr > if (!nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1)) > svc_get(nn->nfsd_serv); > > - nfsd_put(net); > + nfsd_put(net, 0); > return 0; > out_close: > xprt = svc_find_xprt(nn->nfsd_serv, transport, net, PF_INET, port); > @@ -757,7 +781,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr > svc_xprt_put(xprt); > } > out_err: > - nfsd_put(net); > + nfsd_put(net, err); > return err; > } > > @@ -1687,7 +1711,7 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb, > int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb) > { > mutex_lock(&nfsd_mutex); > - nfsd_put(sock_net(cb->skb->sk)); > + nfsd_put(sock_net(cb->skb->sk), 0); > mutex_unlock(&nfsd_mutex); > > return 0; > diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h > index f5ff42f41ee7..3aa8cd2c19ac 100644 > --- a/fs/nfsd/nfsd.h > +++ b/fs/nfsd/nfsd.h > @@ -113,13 +113,6 @@ int nfsd_pool_stats_open(struct inode *, struct file *); > int nfsd_pool_stats_release(struct inode *, struct file *); > 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); > > struct nfsdfs_client { > @@ -153,6 +146,7 @@ struct nfsd_net; > enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL }; > int nfsd_vers(struct nfsd_net *nn, int vers, enum vers_op change); > int nfsd_minorversion(struct nfsd_net *nn, u32 minorversion, enum vers_op change); > +void nfsd_last_thread(struct net *net); > void nfsd_reset_versions(struct nfsd_net *nn); > int nfsd_create_serv(struct net *net); > > diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c > index fe61d9bbcc1f..d6939e23ffcf 100644 > --- a/fs/nfsd/nfssvc.c > +++ b/fs/nfsd/nfssvc.c > @@ -542,7 +542,7 @@ static struct notifier_block nfsd_inet6addr_notifier = { > /* Only used under nfsd_mutex, so this atomic may be overkill: */ > static atomic_t nfsd_notifier_refcount = ATOMIC_INIT(0); > > -static void nfsd_last_thread(struct net *net) > +void nfsd_last_thread(struct net *net) > { > struct nfsd_net *nn = net_generic(net, nfsd_net_id); > struct svc_serv *serv = nn->nfsd_serv; > > --- > base-commit: a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 > change-id: 20231211-nfsd-fixes-d9f21d5c12d7 > > Best regards, > -- > Jeff Layton <jlayton@kernel.org> > >
On Tue, 2023-12-12 at 09:59 +1100, NeilBrown wrote: > On Tue, 12 Dec 2023, Jeff Layton wrote: > > When the initial write to the "portlist" file fails, we'll currently put > > the reference to the nn->nfsd_serv, but leave the pointer intact. This > > leads to a UAF if someone tries to write to "portlist" again. > > > > Simple reproducer, from a host with nfsd shut down: > > > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > > > The kernel will oops on the second one when it trips over the dangling > > nn->nfsd_serv pointer. There is a similar bug in __write_ports_addfd. > > > > This patch fixes it by adding some extra logic to nfsd_put to ensure > > that nfsd_last_thread is called prior to putting the reference when the > > conditions are right. > > > > Fixes: 9f28a971ee9f ("nfsd: separate nfsd_last_thread() from nfsd_put()") > > Closes: https://issues.redhat.com/browse/RHEL-19081 > > Reported-by: Zhi Li <yieli@redhat.com> > > Signed-off-by: Jeff Layton <jlayton@kernel.org> > > --- > > This should probably go to stable, but we'll need to backport for v6.6 > > since older kernels don't have nfsd_nl_rpc_status_get_done. We should > > just be able to drop that hunk though. > > --- > > fs/nfsd/nfsctl.c | 32 ++++++++++++++++++++++++++++---- > > fs/nfsd/nfsd.h | 8 +------- > > fs/nfsd/nfssvc.c | 2 +- > > 3 files changed, 30 insertions(+), 12 deletions(-) > > This is much the same as > > https://lore.kernel.org/linux-nfs/20231030011247.9794-2-neilb@suse.de/ > > It seems that didn't land. Maybe I dropped the ball... > > Indeed it is. I thought the problem seemed familiar. Your set is considerably more comprehensive. Looks like I even sent some Reviewed- bys when you sent it. Chuck, can we get these in or was there a problem with them? Thanks, > > > > > diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c > > index 3e15b72f421d..1ceccf804e44 100644 > > --- a/fs/nfsd/nfsctl.c > > +++ b/fs/nfsd/nfsctl.c > > @@ -61,6 +61,30 @@ enum { > > NFSD_MaxReserved > > }; > > > > +/** > > + * nfsd_put - put the reference to the nfsd_serv for given net > > + * @net: the net namespace for the serv > > + * @err: current error for the op > > + * > > + * When putting a reference to the nfsd_serv from a control operation > > + * we must first call nfsd_last_thread if all of these are true: > > + * > > + * - the configuration operation is going fail > > + * - there are no running threads > > + * - there are no successfully configured ports > > + * > > + * Otherwise, just put the serv reference. > > + */ > > +static inline void nfsd_put(struct net *net, int err) > > +{ > > + struct nfsd_net *nn = net_generic(net, nfsd_net_id); > > + struct svc_serv *serv = nn->nfsd_serv; > > + > > + if (err < 0 && !nn->nfsd_serv->sv_nrthreads && !nn->keep_active) > > + nfsd_last_thread(net); > > + svc_put(serv); > > +} > > + > > /* > > * write() for these nodes. > > */ > > @@ -709,7 +733,7 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred > > !nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1)) > > svc_get(nn->nfsd_serv); > > > > - nfsd_put(net); > > + nfsd_put(net, err); > > return err; > > } > > > > @@ -748,7 +772,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr > > if (!nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1)) > > svc_get(nn->nfsd_serv); > > > > - nfsd_put(net); > > + nfsd_put(net, 0); > > return 0; > > out_close: > > xprt = svc_find_xprt(nn->nfsd_serv, transport, net, PF_INET, port); > > @@ -757,7 +781,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr > > svc_xprt_put(xprt); > > } > > out_err: > > - nfsd_put(net); > > + nfsd_put(net, err); > > return err; > > } > > > > @@ -1687,7 +1711,7 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb, > > int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb) > > { > > mutex_lock(&nfsd_mutex); > > - nfsd_put(sock_net(cb->skb->sk)); > > + nfsd_put(sock_net(cb->skb->sk), 0); > > mutex_unlock(&nfsd_mutex); > > > > return 0; > > diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h > > index f5ff42f41ee7..3aa8cd2c19ac 100644 > > --- a/fs/nfsd/nfsd.h > > +++ b/fs/nfsd/nfsd.h > > @@ -113,13 +113,6 @@ int nfsd_pool_stats_open(struct inode *, struct file *); > > int nfsd_pool_stats_release(struct inode *, struct file *); > > 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); > > > > struct nfsdfs_client { > > @@ -153,6 +146,7 @@ struct nfsd_net; > > enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL }; > > int nfsd_vers(struct nfsd_net *nn, int vers, enum vers_op change); > > int nfsd_minorversion(struct nfsd_net *nn, u32 minorversion, enum vers_op change); > > +void nfsd_last_thread(struct net *net); > > void nfsd_reset_versions(struct nfsd_net *nn); > > int nfsd_create_serv(struct net *net); > > > > diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c > > index fe61d9bbcc1f..d6939e23ffcf 100644 > > --- a/fs/nfsd/nfssvc.c > > +++ b/fs/nfsd/nfssvc.c > > @@ -542,7 +542,7 @@ static struct notifier_block nfsd_inet6addr_notifier = { > > /* Only used under nfsd_mutex, so this atomic may be overkill: */ > > static atomic_t nfsd_notifier_refcount = ATOMIC_INIT(0); > > > > -static void nfsd_last_thread(struct net *net) > > +void nfsd_last_thread(struct net *net) > > { > > struct nfsd_net *nn = net_generic(net, nfsd_net_id); > > struct svc_serv *serv = nn->nfsd_serv; > > > > --- > > base-commit: a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 > > change-id: 20231211-nfsd-fixes-d9f21d5c12d7 > > > > Best regards, > > -- > > Jeff Layton <jlayton@kernel.org> > > > > >
On Mon, Dec 11, 2023 at 06:11:04PM -0500, Jeff Layton wrote: > On Tue, 2023-12-12 at 09:59 +1100, NeilBrown wrote: > > On Tue, 12 Dec 2023, Jeff Layton wrote: > > > When the initial write to the "portlist" file fails, we'll currently put > > > the reference to the nn->nfsd_serv, but leave the pointer intact. This > > > leads to a UAF if someone tries to write to "portlist" again. > > > > > > Simple reproducer, from a host with nfsd shut down: > > > > > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > > > > > The kernel will oops on the second one when it trips over the dangling > > > nn->nfsd_serv pointer. There is a similar bug in __write_ports_addfd. > > > > > > This patch fixes it by adding some extra logic to nfsd_put to ensure > > > that nfsd_last_thread is called prior to putting the reference when the > > > conditions are right. > > > > > > Fixes: 9f28a971ee9f ("nfsd: separate nfsd_last_thread() from nfsd_put()") > > > Closes: https://issues.redhat.com/browse/RHEL-19081 > > > Reported-by: Zhi Li <yieli@redhat.com> > > > Signed-off-by: Jeff Layton <jlayton@kernel.org> > > > --- > > > This should probably go to stable, but we'll need to backport for v6.6 > > > since older kernels don't have nfsd_nl_rpc_status_get_done. We should > > > just be able to drop that hunk though. > > > --- > > > fs/nfsd/nfsctl.c | 32 ++++++++++++++++++++++++++++---- > > > fs/nfsd/nfsd.h | 8 +------- > > > fs/nfsd/nfssvc.c | 2 +- > > > 3 files changed, 30 insertions(+), 12 deletions(-) > > > > This is much the same as > > > > https://lore.kernel.org/linux-nfs/20231030011247.9794-2-neilb@suse.de/ > > > > It seems that didn't land. Maybe I dropped the ball... > > Indeed it is. I thought the problem seemed familiar. Your set is > considerably more comprehensive. Looks like I even sent some Reviewed- > bys when you sent it. > > Chuck, can we get these in or was there a problem with them? Offhand, I'd say either I was waiting for some review comments to be addressed or the mail got lost (vger or Exchange or I accidentally deleted the series). I'll go take a look. > Thanks, > > > > > > > > > diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c > > > index 3e15b72f421d..1ceccf804e44 100644 > > > --- a/fs/nfsd/nfsctl.c > > > +++ b/fs/nfsd/nfsctl.c > > > @@ -61,6 +61,30 @@ enum { > > > NFSD_MaxReserved > > > }; > > > > > > +/** > > > + * nfsd_put - put the reference to the nfsd_serv for given net > > > + * @net: the net namespace for the serv > > > + * @err: current error for the op > > > + * > > > + * When putting a reference to the nfsd_serv from a control operation > > > + * we must first call nfsd_last_thread if all of these are true: > > > + * > > > + * - the configuration operation is going fail > > > + * - there are no running threads > > > + * - there are no successfully configured ports > > > + * > > > + * Otherwise, just put the serv reference. > > > + */ > > > +static inline void nfsd_put(struct net *net, int err) > > > +{ > > > + struct nfsd_net *nn = net_generic(net, nfsd_net_id); > > > + struct svc_serv *serv = nn->nfsd_serv; > > > + > > > + if (err < 0 && !nn->nfsd_serv->sv_nrthreads && !nn->keep_active) > > > + nfsd_last_thread(net); > > > + svc_put(serv); > > > +} > > > + > > > /* > > > * write() for these nodes. > > > */ > > > @@ -709,7 +733,7 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred > > > !nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1)) > > > svc_get(nn->nfsd_serv); > > > > > > - nfsd_put(net); > > > + nfsd_put(net, err); > > > return err; > > > } > > > > > > @@ -748,7 +772,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr > > > if (!nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1)) > > > svc_get(nn->nfsd_serv); > > > > > > - nfsd_put(net); > > > + nfsd_put(net, 0); > > > return 0; > > > out_close: > > > xprt = svc_find_xprt(nn->nfsd_serv, transport, net, PF_INET, port); > > > @@ -757,7 +781,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr > > > svc_xprt_put(xprt); > > > } > > > out_err: > > > - nfsd_put(net); > > > + nfsd_put(net, err); > > > return err; > > > } > > > > > > @@ -1687,7 +1711,7 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb, > > > int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb) > > > { > > > mutex_lock(&nfsd_mutex); > > > - nfsd_put(sock_net(cb->skb->sk)); > > > + nfsd_put(sock_net(cb->skb->sk), 0); > > > mutex_unlock(&nfsd_mutex); > > > > > > return 0; > > > diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h > > > index f5ff42f41ee7..3aa8cd2c19ac 100644 > > > --- a/fs/nfsd/nfsd.h > > > +++ b/fs/nfsd/nfsd.h > > > @@ -113,13 +113,6 @@ int nfsd_pool_stats_open(struct inode *, struct file *); > > > int nfsd_pool_stats_release(struct inode *, struct file *); > > > 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); > > > > > > struct nfsdfs_client { > > > @@ -153,6 +146,7 @@ struct nfsd_net; > > > enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL }; > > > int nfsd_vers(struct nfsd_net *nn, int vers, enum vers_op change); > > > int nfsd_minorversion(struct nfsd_net *nn, u32 minorversion, enum vers_op change); > > > +void nfsd_last_thread(struct net *net); > > > void nfsd_reset_versions(struct nfsd_net *nn); > > > int nfsd_create_serv(struct net *net); > > > > > > diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c > > > index fe61d9bbcc1f..d6939e23ffcf 100644 > > > --- a/fs/nfsd/nfssvc.c > > > +++ b/fs/nfsd/nfssvc.c > > > @@ -542,7 +542,7 @@ static struct notifier_block nfsd_inet6addr_notifier = { > > > /* Only used under nfsd_mutex, so this atomic may be overkill: */ > > > static atomic_t nfsd_notifier_refcount = ATOMIC_INIT(0); > > > > > > -static void nfsd_last_thread(struct net *net) > > > +void nfsd_last_thread(struct net *net) > > > { > > > struct nfsd_net *nn = net_generic(net, nfsd_net_id); > > > struct svc_serv *serv = nn->nfsd_serv; > > > > > > --- > > > base-commit: a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 > > > change-id: 20231211-nfsd-fixes-d9f21d5c12d7 > > > > > > Best regards, > > > -- > > > Jeff Layton <jlayton@kernel.org> > > > > > > > > > > -- > Jeff Layton <jlayton@kernel.org>
On Tue, Dec 12, 2023 at 08:50:46AM -0500, Chuck Lever wrote: > On Mon, Dec 11, 2023 at 06:11:04PM -0500, Jeff Layton wrote: > > On Tue, 2023-12-12 at 09:59 +1100, NeilBrown wrote: > > > On Tue, 12 Dec 2023, Jeff Layton wrote: > > > > When the initial write to the "portlist" file fails, we'll currently put > > > > the reference to the nn->nfsd_serv, but leave the pointer intact. This > > > > leads to a UAF if someone tries to write to "portlist" again. > > > > > > > > Simple reproducer, from a host with nfsd shut down: > > > > > > > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > > > > > > > The kernel will oops on the second one when it trips over the dangling > > > > nn->nfsd_serv pointer. There is a similar bug in __write_ports_addfd. > > > > > > > > This patch fixes it by adding some extra logic to nfsd_put to ensure > > > > that nfsd_last_thread is called prior to putting the reference when the > > > > conditions are right. > > > > > > > > Fixes: 9f28a971ee9f ("nfsd: separate nfsd_last_thread() from nfsd_put()") > > > > Closes: https://issues.redhat.com/browse/RHEL-19081 > > > > Reported-by: Zhi Li <yieli@redhat.com> > > > > Signed-off-by: Jeff Layton <jlayton@kernel.org> > > > > --- > > > > This should probably go to stable, but we'll need to backport for v6.6 > > > > since older kernels don't have nfsd_nl_rpc_status_get_done. We should > > > > just be able to drop that hunk though. > > > > --- > > > > fs/nfsd/nfsctl.c | 32 ++++++++++++++++++++++++++++---- > > > > fs/nfsd/nfsd.h | 8 +------- > > > > fs/nfsd/nfssvc.c | 2 +- > > > > 3 files changed, 30 insertions(+), 12 deletions(-) > > > > > > This is much the same as > > > > > > https://lore.kernel.org/linux-nfs/20231030011247.9794-2-neilb@suse.de/ > > > > > > It seems that didn't land. Maybe I dropped the ball... > > > > Indeed it is. I thought the problem seemed familiar. Your set is > > considerably more comprehensive. Looks like I even sent some Reviewed- > > bys when you sent it. > > > > Chuck, can we get these in or was there a problem with them? > > Offhand, I'd say either I was waiting for some review comments > to be addressed or the mail got lost (vger or Exchange or I > accidentally deleted the series). I'll go take a look. I reviewed the thread: https://lore.kernel.org/linux-nfs/20231030011247.9794-1-neilb@suse.de/ From the looks of it, I was expecting Neil to address a couple of review comments and repost. These are the two comments that stand out to me now: On 1/5: > > Then let's add > > > > Fixes: ec52361df99b ("SUNRPC: stop using ->sv_nrthreads as a refcount") > > > > to this one, since it addresses a crasher seen in the wild. > > Sounds good. > > > > but it won't fix the hinky error cleanup in nfsd_svc. It looks like that > > > does get fixed in patch #4 though, so I'm not too concerned. > > > > Does that fix also need to be backported? > > I think so, but we might want to split that out into a more targeted > patch and apply it ahead of the rest of the series. Our QA folks seem to > be able to hit the problem somehow, so it's likely to be triggered by > people in the field too. This last paragraph requests a bit of reorganization to enable an easier backport. And on 2/5: > > > > +struct pool_private { > > > > + struct svc_serv *(*get_serv)(struct seq_file *, bool); > > > > > > This bool is pretty ugly. I think I'd rather see two operations here > > > (get_serv/put_serv). Also, this could use a kerneldoc comment. > > > > I agree that bool is ugly, but two function pointers as function args > > seemed ugly, and stashing them in 'struct svc_serv' seemed ugly. > > So I picked one. I'd be keen to find an approach that didn't require a > > function pointer. > > > > Maybe sunrpc could declare > > > > struct svc_ref { > > struct mutex mutex; > > struct svc_serv *serv; > > } > > > > and nfsd could use one of those instead of nfsd_mutex and nfsd_serv, and > > pass a pointer to it to the open function. > > > > But then the mutex would have to be in the per-net structure. And maybe > > that isn't a bad idea, but it is a change... > > > > I guess I could pass pointers to nfsd_mutex and nn->nfsd_serv to the > > open function.... > > > > Any other ideas? > > I think just passing two function pointers to svc_pool_stats_open, and > storing them both in the serv is the best solution (for now). Like you > said, there are no clean options here. That function only has one caller > though, so at least the nastiness will be confined to that. > > Moving the mutex to be per-net does make a lot of sense, but I think > that's a separate project. If you decide to do that and it allows you to > make a simpler interface for handling the get/put_serv pointers, then > the interface can be reworked at that point. The other requests I see in that thread have already been answered adequately.
On Wed, 13 Dec 2023, Chuck Lever wrote: > On Tue, Dec 12, 2023 at 08:50:46AM -0500, Chuck Lever wrote: > > On Mon, Dec 11, 2023 at 06:11:04PM -0500, Jeff Layton wrote: > > > On Tue, 2023-12-12 at 09:59 +1100, NeilBrown wrote: > > > > On Tue, 12 Dec 2023, Jeff Layton wrote: > > > > > When the initial write to the "portlist" file fails, we'll currently put > > > > > the reference to the nn->nfsd_serv, but leave the pointer intact. This > > > > > leads to a UAF if someone tries to write to "portlist" again. > > > > > > > > > > Simple reproducer, from a host with nfsd shut down: > > > > > > > > > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > > > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > > > > > > > > > The kernel will oops on the second one when it trips over the dangling > > > > > nn->nfsd_serv pointer. There is a similar bug in __write_ports_addfd. > > > > > > > > > > This patch fixes it by adding some extra logic to nfsd_put to ensure > > > > > that nfsd_last_thread is called prior to putting the reference when the > > > > > conditions are right. > > > > > > > > > > Fixes: 9f28a971ee9f ("nfsd: separate nfsd_last_thread() from nfsd_put()") > > > > > Closes: https://issues.redhat.com/browse/RHEL-19081 > > > > > Reported-by: Zhi Li <yieli@redhat.com> > > > > > Signed-off-by: Jeff Layton <jlayton@kernel.org> > > > > > --- > > > > > This should probably go to stable, but we'll need to backport for v6.6 > > > > > since older kernels don't have nfsd_nl_rpc_status_get_done. We should > > > > > just be able to drop that hunk though. > > > > > --- > > > > > fs/nfsd/nfsctl.c | 32 ++++++++++++++++++++++++++++---- > > > > > fs/nfsd/nfsd.h | 8 +------- > > > > > fs/nfsd/nfssvc.c | 2 +- > > > > > 3 files changed, 30 insertions(+), 12 deletions(-) > > > > > > > > This is much the same as > > > > > > > > https://lore.kernel.org/linux-nfs/20231030011247.9794-2-neilb@suse.de/ > > > > > > > > It seems that didn't land. Maybe I dropped the ball... > > > > > > Indeed it is. I thought the problem seemed familiar. Your set is > > > considerably more comprehensive. Looks like I even sent some Reviewed- > > > bys when you sent it. > > > > > > Chuck, can we get these in or was there a problem with them? > > > > Offhand, I'd say either I was waiting for some review comments > > to be addressed or the mail got lost (vger or Exchange or I > > accidentally deleted the series). I'll go take a look. > > I reviewed the thread: > > https://lore.kernel.org/linux-nfs/20231030011247.9794-1-neilb@suse.de/ > > From the looks of it, I was expecting Neil to address a couple of > review comments and repost. These are the two comments that stand > out to me now: > > On 1/5: > > > > Then let's add > > > > > > Fixes: ec52361df99b ("SUNRPC: stop using ->sv_nrthreads as a refcount") > > > > > > to this one, since it addresses a crasher seen in the wild. > > > > Sounds good. > > > > > > but it won't fix the hinky error cleanup in nfsd_svc. It looks like that > > > > does get fixed in patch #4 though, so I'm not too concerned. > > > > > > Does that fix also need to be backported? > > > > I think so, but we might want to split that out into a more targeted > > patch and apply it ahead of the rest of the series. Our QA folks seem to > > be able to hit the problem somehow, so it's likely to be triggered by > > people in the field too. > > This last paragraph requests a bit of reorganization to enable an > easier backport. I think the "error cleanup" was addressed in a different series. Maybe it hasn't landed either. > > And on 2/5: > > > > > > +struct pool_private { > > > > > + struct svc_serv *(*get_serv)(struct seq_file *, bool); > > > > > > > > This bool is pretty ugly. I think I'd rather see two operations here > > > > (get_serv/put_serv). Also, this could use a kerneldoc comment. > > > > > > I agree that bool is ugly, but two function pointers as function args > > > seemed ugly, and stashing them in 'struct svc_serv' seemed ugly. > > > So I picked one. I'd be keen to find an approach that didn't require a > > > function pointer. > > > > > > Maybe sunrpc could declare > > > > > > struct svc_ref { > > > struct mutex mutex; > > > struct svc_serv *serv; > > > } > > > > > > and nfsd could use one of those instead of nfsd_mutex and nfsd_serv, and > > > pass a pointer to it to the open function. > > > > > > But then the mutex would have to be in the per-net structure. And maybe > > > that isn't a bad idea, but it is a change... > > > > > > I guess I could pass pointers to nfsd_mutex and nn->nfsd_serv to the > > > open function.... > > > > > > Any other ideas? > > > > I think just passing two function pointers to svc_pool_stats_open, and > > storing them both in the serv is the best solution (for now). Like you > > said, there are no clean options here. That function only has one caller > > though, so at least the nastiness will be confined to that. > > We can't store the function pointers in the serv because the purpose of the first function is to find the serv. I guess I should just repost everything again.... but it isn't a good time for year for sustained debates. NeilBrown > > Moving the mutex to be per-net does make a lot of sense, but I think > > that's a separate project. If you decide to do that and it allows you to > > make a simpler interface for handling the get/put_serv pointers, then > > the interface can be reworked at that point. > > The other requests I see in that thread have already been answered > adequately. > > > -- > Chuck Lever >
On Wed, 2023-12-13 at 14:45 +1100, NeilBrown wrote: > On Wed, 13 Dec 2023, Chuck Lever wrote: > > On Tue, Dec 12, 2023 at 08:50:46AM -0500, Chuck Lever wrote: > > > On Mon, Dec 11, 2023 at 06:11:04PM -0500, Jeff Layton wrote: > > > > On Tue, 2023-12-12 at 09:59 +1100, NeilBrown wrote: > > > > > On Tue, 12 Dec 2023, Jeff Layton wrote: > > > > > > When the initial write to the "portlist" file fails, we'll currently put > > > > > > the reference to the nn->nfsd_serv, but leave the pointer intact. This > > > > > > leads to a UAF if someone tries to write to "portlist" again. > > > > > > > > > > > > Simple reproducer, from a host with nfsd shut down: > > > > > > > > > > > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > > > > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > > > > > > > > > > > The kernel will oops on the second one when it trips over the dangling > > > > > > nn->nfsd_serv pointer. There is a similar bug in __write_ports_addfd. > > > > > > > > > > > > This patch fixes it by adding some extra logic to nfsd_put to ensure > > > > > > that nfsd_last_thread is called prior to putting the reference when the > > > > > > conditions are right. > > > > > > > > > > > > Fixes: 9f28a971ee9f ("nfsd: separate nfsd_last_thread() from nfsd_put()") > > > > > > Closes: https://issues.redhat.com/browse/RHEL-19081 > > > > > > Reported-by: Zhi Li <yieli@redhat.com> > > > > > > Signed-off-by: Jeff Layton <jlayton@kernel.org> > > > > > > --- > > > > > > This should probably go to stable, but we'll need to backport for v6.6 > > > > > > since older kernels don't have nfsd_nl_rpc_status_get_done. We should > > > > > > just be able to drop that hunk though. > > > > > > --- > > > > > > fs/nfsd/nfsctl.c | 32 ++++++++++++++++++++++++++++---- > > > > > > fs/nfsd/nfsd.h | 8 +------- > > > > > > fs/nfsd/nfssvc.c | 2 +- > > > > > > 3 files changed, 30 insertions(+), 12 deletions(-) > > > > > > > > > > This is much the same as > > > > > > > > > > https://lore.kernel.org/linux-nfs/20231030011247.9794-2-neilb@suse.de/ > > > > > > > > > > It seems that didn't land. Maybe I dropped the ball... > > > > > > > > Indeed it is. I thought the problem seemed familiar. Your set is > > > > considerably more comprehensive. Looks like I even sent some Reviewed- > > > > bys when you sent it. > > > > > > > > Chuck, can we get these in or was there a problem with them? > > > > > > Offhand, I'd say either I was waiting for some review comments > > > to be addressed or the mail got lost (vger or Exchange or I > > > accidentally deleted the series). I'll go take a look. > > > > I reviewed the thread: > > > > https://lore.kernel.org/linux-nfs/20231030011247.9794-1-neilb@suse.de/ > > > > From the looks of it, I was expecting Neil to address a couple of > > review comments and repost. These are the two comments that stand > > out to me now: > > > > On 1/5: > > > > > > Then let's add > > > > > > > > Fixes: ec52361df99b ("SUNRPC: stop using ->sv_nrthreads as a refcount") > > > > > > > > to this one, since it addresses a crasher seen in the wild. > > > > > > Sounds good. > > > > > > > > but it won't fix the hinky error cleanup in nfsd_svc. It looks like that > > > > > does get fixed in patch #4 though, so I'm not too concerned. > > > > > > > > Does that fix also need to be backported? > > > > > > I think so, but we might want to split that out into a more targeted > > > patch and apply it ahead of the rest of the series. Our QA folks seem to > > > be able to hit the problem somehow, so it's likely to be triggered by > > > people in the field too. > > > > This last paragraph requests a bit of reorganization to enable an > > easier backport. > > I think the "error cleanup" was addressed in a different series. Maybe > it hasn't landed either. > > > > > And on 2/5: > > > > > > > > +struct pool_private { > > > > > > + struct svc_serv *(*get_serv)(struct seq_file *, bool); > > > > > > > > > > This bool is pretty ugly. I think I'd rather see two operations here > > > > > (get_serv/put_serv). Also, this could use a kerneldoc comment. > > > > > > > > I agree that bool is ugly, but two function pointers as function args > > > > seemed ugly, and stashing them in 'struct svc_serv' seemed ugly. > > > > So I picked one. I'd be keen to find an approach that didn't require a > > > > function pointer. > > > > > > > > Maybe sunrpc could declare > > > > > > > > struct svc_ref { > > > > struct mutex mutex; > > > > struct svc_serv *serv; > > > > } > > > > > > > > and nfsd could use one of those instead of nfsd_mutex and nfsd_serv, and > > > > pass a pointer to it to the open function. > > > > > > > > But then the mutex would have to be in the per-net structure. And maybe > > > > that isn't a bad idea, but it is a change... > > > > > > > > I guess I could pass pointers to nfsd_mutex and nn->nfsd_serv to the > > > > open function.... > > > > > > > > Any other ideas? > > > > > > I think just passing two function pointers to svc_pool_stats_open, and > > > storing them both in the serv is the best solution (for now). Like you > > > said, there are no clean options here. That function only has one caller > > > though, so at least the nastiness will be confined to that. > > > > > We can't store the function pointers in the serv because the purpose of > the first function is to find the serv. > Sorry, I didn't mean the serv there. You had this in the patch: +struct pool_private { + struct svc_serv *(*get_serv)(struct seq_file *, bool); + struct svc_serv *serv; +}; Let's just make that: +struct pool_private { + struct svc_serv *(*get_serv)(struct seq_file *); + struct svc_serv *(*put_serv)(struct seq_file *); + struct svc_serv *serv; +}; ...and then just have svc_pool_stats_open take 2 function pointers. It's not pretty but it should be fine. We have other functions that take multiple function pointers in the kernel, so I don't see it as that bad. > I guess I should just repost everything again.... but it isn't a good > time for year for sustained debates. > > That would be good. I'm hoping this is close to merge ready. > > > Moving the mutex to be per-net does make a lot of sense, but I think > > > that's a separate project. If you decide to do that and it allows you to > > > make a simpler interface for handling the get/put_serv pointers, then > > > the interface can be reworked at that point. > > > > The other requests I see in that thread have already been answered > > adequately. > > > > > > -- > > Chuck Lever > > >
On Wed, 2023-12-13 at 14:45 +1100, NeilBrown wrote: > On Wed, 13 Dec 2023, Chuck Lever wrote: > > On Tue, Dec 12, 2023 at 08:50:46AM -0500, Chuck Lever wrote: > > > On Mon, Dec 11, 2023 at 06:11:04PM -0500, Jeff Layton wrote: > > > > On Tue, 2023-12-12 at 09:59 +1100, NeilBrown wrote: > > > > > On Tue, 12 Dec 2023, Jeff Layton wrote: > > > > > > When the initial write to the "portlist" file fails, we'll currently put > > > > > > the reference to the nn->nfsd_serv, but leave the pointer intact. This > > > > > > leads to a UAF if someone tries to write to "portlist" again. > > > > > > > > > > > > Simple reproducer, from a host with nfsd shut down: > > > > > > > > > > > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > > > > > # echo "foo 2049" > /proc/fs/nfsd/portlist > > > > > > > > > > > > The kernel will oops on the second one when it trips over the dangling > > > > > > nn->nfsd_serv pointer. There is a similar bug in __write_ports_addfd. > > > > > > > > > > > > This patch fixes it by adding some extra logic to nfsd_put to ensure > > > > > > that nfsd_last_thread is called prior to putting the reference when the > > > > > > conditions are right. > > > > > > > > > > > > Fixes: 9f28a971ee9f ("nfsd: separate nfsd_last_thread() from nfsd_put()") > > > > > > Closes: https://issues.redhat.com/browse/RHEL-19081 > > > > > > Reported-by: Zhi Li <yieli@redhat.com> > > > > > > Signed-off-by: Jeff Layton <jlayton@kernel.org> > > > > > > --- > > > > > > This should probably go to stable, but we'll need to backport for v6.6 > > > > > > since older kernels don't have nfsd_nl_rpc_status_get_done. We should > > > > > > just be able to drop that hunk though. > > > > > > --- > > > > > > fs/nfsd/nfsctl.c | 32 ++++++++++++++++++++++++++++---- > > > > > > fs/nfsd/nfsd.h | 8 +------- > > > > > > fs/nfsd/nfssvc.c | 2 +- > > > > > > 3 files changed, 30 insertions(+), 12 deletions(-) > > > > > > > > > > This is much the same as > > > > > > > > > > https://lore.kernel.org/linux-nfs/20231030011247.9794-2-neilb@suse.de/ > > > > > > > > > > It seems that didn't land. Maybe I dropped the ball... > > > > > > > > Indeed it is. I thought the problem seemed familiar. Your set is > > > > considerably more comprehensive. Looks like I even sent some Reviewed- > > > > bys when you sent it. > > > > > > > > Chuck, can we get these in or was there a problem with them? > > > > > > Offhand, I'd say either I was waiting for some review comments > > > to be addressed or the mail got lost (vger or Exchange or I > > > accidentally deleted the series). I'll go take a look. > > > > I reviewed the thread: > > > > https://lore.kernel.org/linux-nfs/20231030011247.9794-1-neilb@suse.de/ > > > > From the looks of it, I was expecting Neil to address a couple of > > review comments and repost. These are the two comments that stand > > out to me now: > > > > On 1/5: > > > > > > Then let's add > > > > > > > > Fixes: ec52361df99b ("SUNRPC: stop using ->sv_nrthreads as a refcount") > > > > > > > > to this one, since it addresses a crasher seen in the wild. > > > > > > Sounds good. > > > > > > > > but it won't fix the hinky error cleanup in nfsd_svc. It looks like that > > > > > does get fixed in patch #4 though, so I'm not too concerned. > > > > > > > > Does that fix also need to be backported? > > > > > > I think so, but we might want to split that out into a more targeted > > > patch and apply it ahead of the rest of the series. Our QA folks seem to > > > be able to hit the problem somehow, so it's likely to be triggered by > > > people in the field too. > > > > This last paragraph requests a bit of reorganization to enable an > > easier backport. > > I think the "error cleanup" was addressed in a different series. Maybe > it hasn't landed either. > No, I think that one is in. The main problem we have now is the write_ports oops, which is a different problem altogether. > > > > And on 2/5: > > > > > > > > +struct pool_private { > > > > > > + struct svc_serv *(*get_serv)(struct seq_file *, bool); > > > > > > > > > > This bool is pretty ugly. I think I'd rather see two operations here > > > > > (get_serv/put_serv). Also, this could use a kerneldoc comment. > > > > > > > > I agree that bool is ugly, but two function pointers as function args > > > > seemed ugly, and stashing them in 'struct svc_serv' seemed ugly. > > > > So I picked one. I'd be keen to find an approach that didn't require a > > > > function pointer. > > > > > > > > Maybe sunrpc could declare > > > > > > > > struct svc_ref { > > > > struct mutex mutex; > > > > struct svc_serv *serv; > > > > } > > > > > > > > and nfsd could use one of those instead of nfsd_mutex and nfsd_serv, and > > > > pass a pointer to it to the open function. > > > > > > > > But then the mutex would have to be in the per-net structure. And maybe > > > > that isn't a bad idea, but it is a change... > > > > > > > > I guess I could pass pointers to nfsd_mutex and nn->nfsd_serv to the > > > > open function.... > > > > > > > > Any other ideas? > > > > > > I think just passing two function pointers to svc_pool_stats_open, and > > > storing them both in the serv is the best solution (for now). Like you > > > said, there are no clean options here. That function only has one caller > > > though, so at least the nastiness will be confined to that. > > > > > We can't store the function pointers in the serv because the purpose of > the first function is to find the serv. > > I guess I should just repost everything again.... but it isn't a good > time for year for sustained debates. > > NeilBrown > > > > > Moving the mutex to be per-net does make a lot of sense, but I think > > > that's a separate project. If you decide to do that and it allows you to > > > make a simpler interface for handling the get/put_serv pointers, then > > > the interface can be reworked at that point. > > > > The other requests I see in that thread have already been answered > > adequately. > > > > > > -- > > Chuck Lever > > >
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 3e15b72f421d..1ceccf804e44 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -61,6 +61,30 @@ enum { NFSD_MaxReserved }; +/** + * nfsd_put - put the reference to the nfsd_serv for given net + * @net: the net namespace for the serv + * @err: current error for the op + * + * When putting a reference to the nfsd_serv from a control operation + * we must first call nfsd_last_thread if all of these are true: + * + * - the configuration operation is going fail + * - there are no running threads + * - there are no successfully configured ports + * + * Otherwise, just put the serv reference. + */ +static inline void nfsd_put(struct net *net, int err) +{ + struct nfsd_net *nn = net_generic(net, nfsd_net_id); + struct svc_serv *serv = nn->nfsd_serv; + + if (err < 0 && !nn->nfsd_serv->sv_nrthreads && !nn->keep_active) + nfsd_last_thread(net); + svc_put(serv); +} + /* * write() for these nodes. */ @@ -709,7 +733,7 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred !nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1)) svc_get(nn->nfsd_serv); - nfsd_put(net); + nfsd_put(net, err); return err; } @@ -748,7 +772,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr if (!nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1)) svc_get(nn->nfsd_serv); - nfsd_put(net); + nfsd_put(net, 0); return 0; out_close: xprt = svc_find_xprt(nn->nfsd_serv, transport, net, PF_INET, port); @@ -757,7 +781,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr svc_xprt_put(xprt); } out_err: - nfsd_put(net); + nfsd_put(net, err); return err; } @@ -1687,7 +1711,7 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb, int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb) { mutex_lock(&nfsd_mutex); - nfsd_put(sock_net(cb->skb->sk)); + nfsd_put(sock_net(cb->skb->sk), 0); mutex_unlock(&nfsd_mutex); return 0; diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index f5ff42f41ee7..3aa8cd2c19ac 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -113,13 +113,6 @@ int nfsd_pool_stats_open(struct inode *, struct file *); int nfsd_pool_stats_release(struct inode *, struct file *); 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); struct nfsdfs_client { @@ -153,6 +146,7 @@ struct nfsd_net; enum vers_op {NFSD_SET, NFSD_CLEAR, NFSD_TEST, NFSD_AVAIL }; int nfsd_vers(struct nfsd_net *nn, int vers, enum vers_op change); int nfsd_minorversion(struct nfsd_net *nn, u32 minorversion, enum vers_op change); +void nfsd_last_thread(struct net *net); void nfsd_reset_versions(struct nfsd_net *nn); int nfsd_create_serv(struct net *net); diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index fe61d9bbcc1f..d6939e23ffcf 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -542,7 +542,7 @@ static struct notifier_block nfsd_inet6addr_notifier = { /* Only used under nfsd_mutex, so this atomic may be overkill: */ static atomic_t nfsd_notifier_refcount = ATOMIC_INIT(0); -static void nfsd_last_thread(struct net *net) +void nfsd_last_thread(struct net *net) { struct nfsd_net *nn = net_generic(net, nfsd_net_id); struct svc_serv *serv = nn->nfsd_serv;
When the initial write to the "portlist" file fails, we'll currently put the reference to the nn->nfsd_serv, but leave the pointer intact. This leads to a UAF if someone tries to write to "portlist" again. Simple reproducer, from a host with nfsd shut down: # echo "foo 2049" > /proc/fs/nfsd/portlist # echo "foo 2049" > /proc/fs/nfsd/portlist The kernel will oops on the second one when it trips over the dangling nn->nfsd_serv pointer. There is a similar bug in __write_ports_addfd. This patch fixes it by adding some extra logic to nfsd_put to ensure that nfsd_last_thread is called prior to putting the reference when the conditions are right. Fixes: 9f28a971ee9f ("nfsd: separate nfsd_last_thread() from nfsd_put()") Closes: https://issues.redhat.com/browse/RHEL-19081 Reported-by: Zhi Li <yieli@redhat.com> Signed-off-by: Jeff Layton <jlayton@kernel.org> --- This should probably go to stable, but we'll need to backport for v6.6 since older kernels don't have nfsd_nl_rpc_status_get_done. We should just be able to drop that hunk though. --- fs/nfsd/nfsctl.c | 32 ++++++++++++++++++++++++++++---- fs/nfsd/nfsd.h | 8 +------- fs/nfsd/nfssvc.c | 2 +- 3 files changed, 30 insertions(+), 12 deletions(-) --- base-commit: a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 change-id: 20231211-nfsd-fixes-d9f21d5c12d7 Best regards,