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

NFSD: Replace READ* macros in nfsd4_decode_create()

Browse source 
[ Upstream commit 000dfa18b3df9c62df5f768f9187cf1a94ded71d ]

A dedicated decoder for component4 is introduced here, which will be
used by other operation decoders in subsequent patches.

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-03 13:24:10 -05:00 committed by Ksawlii
parent 9b989a3f4d
commit bf141817e8
1 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
fs/nfsd/nfs4xdr.c
View file

@ -92,6 +92,8 @@ check_filename(char *str, int len)
if (len == 0) if (len == 0)
return nfserr_inval; return nfserr_inval;
if (len > NFS4_MAXNAMLEN)
return nfserr_nametoolong;
if (isdotent(str, len)) if (isdotent(str, len))
return nfserr_badname; return nfserr_badname;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
@ -205,6 +207,27 @@ static char *savemem(struct nfsd4_compoundargs *argp, __be32 *p, int nbytes)
return ret; return ret;
} }
static __be32
nfsd4_decode_component4(struct nfsd4_compoundargs *argp, char **namp, u32 *lenp)
{
__be32 *p, status;
if (xdr_stream_decode_u32(argp->xdr, lenp) < 0)
return nfserr_bad_xdr;
p = xdr_inline_decode(argp->xdr, *lenp);
if (!p)
return nfserr_bad_xdr;
status = check_filename((char *)p, *lenp);
if (status)
return status;
*namp = svcxdr_tmpalloc(argp, *lenp);
if (!*namp)
return nfserr_jukebox;
memcpy(*namp, p, *lenp);
return nfs_ok;
}
static __be32 static __be32
nfsd4_decode_time(struct nfsd4_compoundargs *argp, struct timespec64 *tv) nfsd4_decode_time(struct nfsd4_compoundargs *argp, struct timespec64 *tv)
{ {
@ -698,24 +721,27 @@ nfsd4_decode_commit(struct nfsd4_compoundargs *argp, struct nfsd4_commit *commit
static __be32 static __be32
nfsd4_decode_create(struct nfsd4_compoundargs *argp, struct nfsd4_create *create) nfsd4_decode_create(struct nfsd4_compoundargs *argp, struct nfsd4_create *create)
{ {
DECODE_HEAD; __be32 *p, status;
READ_BUF(4); if (xdr_stream_decode_u32(argp->xdr, &create->cr_type) < 0)
create->cr_type = be32_to_cpup(p++); return nfserr_bad_xdr;
switch (create->cr_type) { switch (create->cr_type) {
case NF4LNK: case NF4LNK:
READ_BUF(4); if (xdr_stream_decode_u32(argp->xdr, &create->cr_datalen) < 0)
create->cr_datalen = be32_to_cpup(p++); return nfserr_bad_xdr;
READ_BUF(create->cr_datalen); p = xdr_inline_decode(argp->xdr, create->cr_datalen);
if (!p)
return nfserr_bad_xdr;
create->cr_data = svcxdr_dupstr(argp, p, create->cr_datalen); create->cr_data = svcxdr_dupstr(argp, p, create->cr_datalen);
if (!create->cr_data) if (!create->cr_data)
return nfserr_jukebox; return nfserr_jukebox;
break; break;
case NF4BLK: case NF4BLK:
case NF4CHR: case NF4CHR:
READ_BUF(8); if (xdr_stream_decode_u32(argp->xdr, &create->cr_specdata1) < 0)
create->cr_specdata1 = be32_to_cpup(p++); return nfserr_bad_xdr;
create->cr_specdata2 = be32_to_cpup(p++); if (xdr_stream_decode_u32(argp->xdr, &create->cr_specdata2) < 0)
return nfserr_bad_xdr;
break; break;
case NF4SOCK: case NF4SOCK:
case NF4FIFO: case NF4FIFO:
@ -723,22 +749,18 @@ nfsd4_decode_create(struct nfsd4_compoundargs *argp, struct nfsd4_create *create
default: default:
break; break;
} }
status = nfsd4_decode_component4(argp, &create->cr_name,
READ_BUF(4); &create->cr_namelen);
create->cr_namelen = be32_to_cpup(p++); if (status)
READ_BUF(create->cr_namelen);
SAVEMEM(create->cr_name, create->cr_namelen);
if ((status = check_filename(create->cr_name, create->cr_namelen)))
return status; return status;
status = nfsd4_decode_fattr4(argp, create->cr_bmval, status = nfsd4_decode_fattr4(argp, create->cr_bmval,
ARRAY_SIZE(create->cr_bmval), ARRAY_SIZE(create->cr_bmval),
&create->cr_iattr, &create->cr_acl, &create->cr_iattr, &create->cr_acl,
&create->cr_label, &create->cr_umask); &create->cr_label, &create->cr_umask);
if (status) if (status)
goto out; return status;
DECODE_TAIL; return nfs_ok;
} }
static inline __be32 static inline __be32