hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2020-10-21 12:14:23 -04:00
parent f8a38e2d6c
commit ebcd8e8b28
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfsd/nfsproc.c
View File

@ -627,7 +627,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
}, },
[NFSPROC_GETATTR] = { [NFSPROC_GETATTR] = {
.pc_func = nfsd_proc_getattr, .pc_func = nfsd_proc_getattr,
.pc_decode = nfssvc_decode_fhandle, .pc_decode = nfssvc_decode_fhandleargs,
.pc_encode = nfssvc_encode_attrstat, .pc_encode = nfssvc_encode_attrstat,
.pc_release = nfssvc_release_attrstat, .pc_release = nfssvc_release_attrstat,
.pc_argsize = sizeof(struct nfsd_fhandle), .pc_argsize = sizeof(struct nfsd_fhandle),
@ -793,7 +793,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
}, },
[NFSPROC_STATFS] = { [NFSPROC_STATFS] = {
.pc_func = nfsd_proc_statfs, .pc_func = nfsd_proc_statfs,
.pc_decode = nfssvc_decode_fhandle, .pc_decode = nfssvc_decode_fhandleargs,
.pc_encode = nfssvc_encode_statfsres, .pc_encode = nfssvc_encode_statfsres,
.pc_argsize = sizeof(struct nfsd_fhandle), .pc_argsize = sizeof(struct nfsd_fhandle),
.pc_ressize = sizeof(struct nfsd_statfsres), .pc_ressize = sizeof(struct nfsd_statfsres),

26
fs/nfsd/nfsxdr.c
View File

@ -23,8 +23,9 @@ static u32 nfs_ftypes[] = {
/* /*
* XDR functions for basic NFS types * Basic NFSv2 data types (RFC 1094 Section 2.3)
*/ */
static __be32 * static __be32 *
decode_fh(__be32 *p, struct svc_fh *fhp) decode_fh(__be32 *p, struct svc_fh *fhp)
{ {
@ -37,6 +38,21 @@ decode_fh(__be32 *p, struct svc_fh *fhp)
return p + (NFS_FHSIZE >> 2); return p + (NFS_FHSIZE >> 2);
} }
static bool
svcxdr_decode_fhandle(struct xdr_stream *xdr, struct svc_fh *fhp)
{
__be32 *p;
p = xdr_inline_decode(xdr, NFS_FHSIZE);
if (!p)
return false;
fh_init(fhp, NFS_FHSIZE);
memcpy(&fhp->fh_handle.fh_base, p, NFS_FHSIZE);
fhp->fh_handle.fh_size = NFS_FHSIZE;
return true;
}
/* Helper function for NFSv2 ACL code */ /* Helper function for NFSv2 ACL code */
__be32 *nfs2svc_decode_fh(__be32 *p, struct svc_fh *fhp) __be32 *nfs2svc_decode_fh(__be32 *p, struct svc_fh *fhp)
{ {
@ -194,14 +210,12 @@ __be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *f
*/ */
int int
nfssvc_decode_fhandle(struct svc_rqst *rqstp, __be32 *p) nfssvc_decode_fhandleargs(struct svc_rqst *rqstp, __be32 *p)
{ {
struct xdr_stream *xdr = &rqstp->rq_arg_stream;
struct nfsd_fhandle *args = rqstp->rq_argp; struct nfsd_fhandle *args = rqstp->rq_argp;
p = decode_fh(p, &args->fh); return svcxdr_decode_fhandle(xdr, &args->fh);
if (!p)
return 0;
return xdr_argsize_check(rqstp, p);
} }
int int

2
fs/nfsd/xdr.h
View File

@ -144,7 +144,7 @@ union nfsd_xdrstore {
#define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore) #define NFS2_SVC_XDRSIZE sizeof(union nfsd_xdrstore)
int nfssvc_decode_fhandle(struct svc_rqst *, __be32 *); int nfssvc_decode_fhandleargs(struct svc_rqst *, __be32 *);
int nfssvc_decode_sattrargs(struct svc_rqst *, __be32 *); int nfssvc_decode_sattrargs(struct svc_rqst *, __be32 *);
int nfssvc_decode_diropargs(struct svc_rqst *, __be32 *); int nfssvc_decode_diropargs(struct svc_rqst *, __be32 *);
int nfssvc_decode_readargs(struct svc_rqst *, __be32 *); int nfssvc_decode_readargs(struct svc_rqst *, __be32 *);