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

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

Browse source 
[ Upstream commit 635a45d34706400c59c3b18ca9fccba195147bda ]

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:32:04 -05:00 • committed by Ksawlii
parent 54fc934afd
commit 67e87fecaa
4 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/nfsd/nfs2acl.c
View file

@ -188,17 +188,17 @@ out:
static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p) static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p)
{ {
struct xdr_stream *xdr = &rqstp->rq_arg_stream;
struct nfsd3_getaclargs *argp = rqstp->rq_argp; struct nfsd3_getaclargs *argp = rqstp->rq_argp;
p = nfs2svc_decode_fh(p, &argp->fh); if (!svcxdr_decode_fhandle(xdr, &argp->fh))
if (!p) return 0;
if (xdr_stream_decode_u32(xdr, &argp->mask) < 0)
return 0; return 0;
argp->mask = ntohl(*p); p++;
return xdr_argsize_check(rqstp, p); return 1;
} }
static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p) static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p)
{ {
struct nfsd3_setaclargs *argp = rqstp->rq_argp; struct nfsd3_setaclargs *argp = rqstp->rq_argp;

11
fs/nfsd/nfsxdr.c
View file

@ -38,7 +38,16 @@ decode_fh(__be32 *p, struct svc_fh *fhp)
return p + (NFS_FHSIZE >> 2); return p + (NFS_FHSIZE >> 2);
} }
static bool /**
* svcxdr_decode_fhandle - Decode an NFSv2 file handle
* @xdr: XDR stream positioned at an encoded NFSv2 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_fhandle(struct xdr_stream *xdr, struct svc_fh *fhp) svcxdr_decode_fhandle(struct xdr_stream *xdr, struct svc_fh *fhp)
{ {
__be32 *p; __be32 *p;

1
fs/nfsd/xdr.h
View file

@ -165,5 +165,6 @@ void nfssvc_release_readres(struct svc_rqst *rqstp);
/* Helper functions for NFSv2 ACL code */ /* Helper functions for NFSv2 ACL code */
__be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, struct kstat *stat); __be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, struct kstat *stat);
__be32 *nfs2svc_decode_fh(__be32 *p, struct svc_fh *fhp); __be32 *nfs2svc_decode_fh(__be32 *p, struct svc_fh *fhp);
bool svcxdr_decode_fhandle(struct xdr_stream *xdr, struct svc_fh *fhp);
#endif /* LINUX_NFSD_H */ #endif /* LINUX_NFSD_H */

2
fs/nfsd/xdr3.h
View file

@ -102,7 +102,7 @@ struct nfsd3_commitargs {
struct nfsd3_getaclargs { struct nfsd3_getaclargs {
struct svc_fh fh; struct svc_fh fh;
int mask; __u32 mask;
}; };
struct posix_acl; struct posix_acl;