leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFSD: Replace READ* macros that decode the fattr4 time_set attributes

Browse Source 
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2020-11-19 14:01:08 -05:00
parent 393c31dd27
commit 1c3eff7ea4
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fs/nfsd/nfs4xdr.c
View File

@ -219,6 +219,21 @@ nfsd4_decode_time(struct nfsd4_compoundargs *argp, struct timespec64 *tv)
DECODE_TAIL; DECODE_TAIL;
} }
static __be32
nfsd4_decode_nfstime4(struct nfsd4_compoundargs *argp, struct timespec64 *tv)
{
__be32 *p;
p = xdr_inline_decode(argp->xdr, XDR_UNIT * 3);
if (!p)
return nfserr_bad_xdr;
p = xdr_decode_hyper(p, &tv->tv_sec);
tv->tv_nsec = be32_to_cpup(p++);
if (tv->tv_nsec >= (u32)1000000000)
return nfserr_inval;
return nfs_ok;
}
static __be32 static __be32
nfsd4_decode_bitmap(struct nfsd4_compoundargs *argp, u32 *bmval) nfsd4_decode_bitmap(struct nfsd4_compoundargs *argp, u32 *bmval)
{ {
@ -388,11 +403,13 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
iattr->ia_valid |= ATTR_GID; iattr->ia_valid |= ATTR_GID;
} }
if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) { if (bmval[1] & FATTR4_WORD1_TIME_ACCESS_SET) {
READ_BUF(4); u32 set_it;
dummy32 = be32_to_cpup(p++);
switch (dummy32) { if (xdr_stream_decode_u32(argp->xdr, &set_it) < 0)
return nfserr_bad_xdr;
switch (set_it) {
case NFS4_SET_TO_CLIENT_TIME: case NFS4_SET_TO_CLIENT_TIME:
status = nfsd4_decode_time(argp, &iattr->ia_atime); status = nfsd4_decode_nfstime4(argp, &iattr->ia_atime);
if (status) if (status)
return status; return status;
iattr->ia_valid |= (ATTR_ATIME | ATTR_ATIME_SET); iattr->ia_valid |= (ATTR_ATIME | ATTR_ATIME_SET);
@ -401,15 +418,17 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
iattr->ia_valid |= ATTR_ATIME; iattr->ia_valid |= ATTR_ATIME;
break; break;
default: default:
goto xdr_error; return nfserr_bad_xdr;
} }
} }
if (bmval[1] & FATTR4_WORD1_TIME_MODIFY_SET) { if (bmval[1] & FATTR4_WORD1_TIME_MODIFY_SET) {
READ_BUF(4); u32 set_it;
dummy32 = be32_to_cpup(p++);
switch (dummy32) { if (xdr_stream_decode_u32(argp->xdr, &set_it) < 0)
return nfserr_bad_xdr;
switch (set_it) {
case NFS4_SET_TO_CLIENT_TIME: case NFS4_SET_TO_CLIENT_TIME:
status = nfsd4_decode_time(argp, &iattr->ia_mtime); status = nfsd4_decode_nfstime4(argp, &iattr->ia_mtime);
if (status) if (status)
return status; return status;
iattr->ia_valid |= (ATTR_MTIME | ATTR_MTIME_SET); iattr->ia_valid |= (ATTR_MTIME | ATTR_MTIME_SET);
@ -418,7 +437,7 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
iattr->ia_valid |= ATTR_MTIME; iattr->ia_valid |= ATTR_MTIME;
break; break;
default: default:
goto xdr_error; return nfserr_bad_xdr;
} }
} }