NFSD: Replace READ* macros that decode the fattr4 owner attribute

[ Upstream commit 9853a5ac9be381917e9be0b4133cd4ac5a7ad875 ]

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-19 13:56:42 -05:00 committed by Ksawlii
parent 502e31b392
commit 4d043b60f5

View file

@ -360,11 +360,16 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
iattr->ia_valid |= ATTR_MODE; iattr->ia_valid |= ATTR_MODE;
} }
if (bmval[1] & FATTR4_WORD1_OWNER) { if (bmval[1] & FATTR4_WORD1_OWNER) {
READ_BUF(4); u32 length;
dummy32 = be32_to_cpup(p++);
READ_BUF(dummy32); if (xdr_stream_decode_u32(argp->xdr, &length) < 0)
READMEM(buf, dummy32); return nfserr_bad_xdr;
if ((status = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid))) p = xdr_inline_decode(argp->xdr, length);
if (!p)
return nfserr_bad_xdr;
status = nfsd_map_name_to_uid(argp->rqstp, (char *)p, length,
&iattr->ia_uid);
if (status)
return status; return status;
iattr->ia_valid |= ATTR_UID; iattr->ia_valid |= ATTR_UID;
} }