Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSD: Update the NFSv3 GETACL argument decoder to use struct xdr_stream

Browse source 
[ Upstream commit 05027eafc266487c6e056d10ab352861df95b5d4 ]

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever 2020-11-17 11:52:04 -05:00 • committed by Ksawlii
parent 2da089d28a
commit 367a75f550
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/nfsd/nfs3acl.c
View file

@ -124,19 +124,20 @@ out:
/* /*
* XDR decode functions * XDR decode functions
*/ */
static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p) static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p)
{ {
struct xdr_stream *xdr = &rqstp->rq_arg_stream;
struct nfsd3_getaclargs *args = rqstp->rq_argp; struct nfsd3_getaclargs *args = rqstp->rq_argp;
p = nfs3svc_decode_fh(p, &args->fh); if (!svcxdr_decode_nfs_fh3(xdr, &args->fh))
if (!p) return 0;
if (xdr_stream_decode_u32(xdr, &args->mask) < 0)
return 0; return 0;
args->mask = ntohl(*p); p++;
return xdr_argsize_check(rqstp, p); return 1;
} }
static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p) static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p)
{ {
struct nfsd3_setaclargs *args = rqstp->rq_argp; struct nfsd3_setaclargs *args = rqstp->rq_argp;

11
fs/nfsd/nfs3xdr.c
View file

@ -53,7 +53,16 @@ svcxdr_decode_nfstime3(struct xdr_stream *xdr, struct timespec64 *timep)
return true; return true;
} }
static bool /**
* svcxdr_decode_nfs_fh3 - Decode an NFSv3 file handle
* @xdr: XDR stream positioned at an undecoded NFSv3 FH
* @fhp: OUT: filled-in server file handle
*
* Return values:
* %false: The encoded file handle was not valid
* %true: @fhp has been initialized
*/
bool
svcxdr_decode_nfs_fh3(struct xdr_stream *xdr, struct svc_fh *fhp) svcxdr_decode_nfs_fh3(struct xdr_stream *xdr, struct svc_fh *fhp)
{ {
__be32 *p; __be32 *p;

1
fs/nfsd/xdr3.h
View file

@ -308,6 +308,7 @@ int nfs3svc_encode_entry_plus(void *, const char *name,
__be32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, __be32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p,
struct svc_fh *fhp); struct svc_fh *fhp);
__be32 *nfs3svc_decode_fh(__be32 *p, struct svc_fh *fhp); __be32 *nfs3svc_decode_fh(__be32 *p, struct svc_fh *fhp);
bool svcxdr_decode_nfs_fh3(struct xdr_stream *xdr, struct svc_fh *fhp);
#endif /* _LINUX_NFSD_XDR3_H */ #endif /* _LINUX_NFSD_XDR3_H */