Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52300eb1 authored by Chuck Lever's avatar Chuck Lever Committed by Greg Kroah-Hartman
Browse files

NFSD: Fix NFSv4's PUTPUBFH operation 



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: default avatarCedric Blancher <cedric.blancher@gmail.com>
Fixes: e1a90ebd ("NFSD: Combine decode operations for v4 and v4.1")
Cc: Dan Shelton <dan.f.shelton@gmail.com>
Cc: Roland Mainz <roland.mainz@nrubsig.org>
Cc: stable@vger.kernel.org
[ cel: adjusted to apply to origin/linux-5.4.y ]
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56fa2e5d

fs/nfsd/nfs4xdr.c

+1 −9
Original line number Diff line number Diff line
@@ -1068,14 +1068,6 @@ nfsd4_decode_putfh(struct nfsd4_compoundargs *argp, struct nfsd4_putfh *putfh) 
	DECODE_TAIL;

}



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)

{
@@ -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,