Greg, thank you Ced On Tue, 12 Nov 2024 at 09:38, <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > This is a note to let you know that I've just added the patch titled > > NFSD: Fix NFSv4's PUTPUBFH operation > > to the 5.4-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > nfsd-fix-nfsv4-s-putpubfh-operation.patch > and it can be found in the queue-5.4 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > From 202f39039a11402dcbcd5fece8d9fa6be83f49ae Mon Sep 17 00:00:00 2001 > From: Chuck Lever <chuck.lever@xxxxxxxxxx> > Date: Sun, 11 Aug 2024 13:11:07 -0400 > Subject: NFSD: Fix NFSv4's PUTPUBFH operation > > From: Chuck Lever <chuck.lever@xxxxxxxxxx> > > commit 202f39039a11402dcbcd5fece8d9fa6be83f49ae upstream. > > According to RFC 8881, all minor versions of NFSv4 support PUTPUBFH. > > Replace the XDR decoder for PUTPUBFH with a "noop" since we no > longer want the minorversion check, and PUTPUBFH has no arguments to > decode. (Ideally nfsd4_decode_noop should really be called > nfsd4_decode_void). > > PUTPUBFH should now behave just like PUTROOTFH. > > Reported-by: Cedric Blancher <cedric.blancher@xxxxxxxxx> > Fixes: e1a90ebd8b23 ("NFSD: Combine decode operations for v4 and v4.1") > Cc: Dan Shelton <dan.f.shelton@xxxxxxxxx> > Cc: Roland Mainz <roland.mainz@xxxxxxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx > [ cel: adjusted to apply to origin/linux-5.4.y ] > Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > --- > fs/nfsd/nfs4xdr.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > --- a/fs/nfsd/nfs4xdr.c > +++ b/fs/nfsd/nfs4xdr.c > @@ -1069,14 +1069,6 @@ nfsd4_decode_putfh(struct nfsd4_compound > } > > static __be32 > -nfsd4_decode_putpubfh(struct nfsd4_compoundargs *argp, void *p) > -{ > - if (argp->minorversion == 0) > - return nfs_ok; > - return nfserr_notsupp; > -} > - > -static __be32 > nfsd4_decode_read(struct nfsd4_compoundargs *argp, struct nfsd4_read *read) > { > DECODE_HEAD; > @@ -1825,7 +1817,7 @@ static const nfsd4_dec nfsd4_dec_ops[] = > [OP_OPEN_CONFIRM] = (nfsd4_dec)nfsd4_decode_open_confirm, > [OP_OPEN_DOWNGRADE] = (nfsd4_dec)nfsd4_decode_open_downgrade, > [OP_PUTFH] = (nfsd4_dec)nfsd4_decode_putfh, > - [OP_PUTPUBFH] = (nfsd4_dec)nfsd4_decode_putpubfh, > + [OP_PUTPUBFH] = (nfsd4_dec)nfsd4_decode_noop, > [OP_PUTROOTFH] = (nfsd4_dec)nfsd4_decode_noop, > [OP_READ] = (nfsd4_dec)nfsd4_decode_read, > [OP_READDIR] = (nfsd4_dec)nfsd4_decode_readdir, > > > Patches currently in stable-queue which might be from chuck.lever@xxxxxxxxxx are > > queue-5.4/nfsd-fix-nfsv4-s-putpubfh-operation.patch -- Cedric Blancher <cedric.blancher@xxxxxxxxx> [https://plus.google.com/u/0/+CedricBlancher/] Institute Pasteur
