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_nl4_server()

Browse source 
[ Upstream commit f49e4b4d58cc835d8bd0cc9663f7b9c5497e0e7e ]

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-16 18:05:06 -05:00 • committed by Ksawlii
parent c9f85bc6fc
commit 8315f841ec
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
fs/nfsd/nfs4xdr.c
View file

@ -1941,36 +1941,42 @@ nfsd4_decode_clone(struct nfsd4_compoundargs *argp, struct nfsd4_clone *clone)
static __be32 nfsd4_decode_nl4_server(struct nfsd4_compoundargs *argp, static __be32 nfsd4_decode_nl4_server(struct nfsd4_compoundargs *argp,
struct nl4_server *ns) struct nl4_server *ns)
{ {
DECODE_HEAD;
struct nfs42_netaddr *naddr; struct nfs42_netaddr *naddr;
__be32 *p;
READ_BUF(4); if (xdr_stream_decode_u32(argp->xdr, &ns->nl4_type) < 0)
ns->nl4_type = be32_to_cpup(p++); return nfserr_bad_xdr;
/* currently support for 1 inter-server source server */ /* currently support for 1 inter-server source server */
switch (ns->nl4_type) { switch (ns->nl4_type) {
case NL4_NETADDR: case NL4_NETADDR:
naddr = &ns->u.nl4_addr; naddr = &ns->u.nl4_addr;
READ_BUF(4); if (xdr_stream_decode_u32(argp->xdr, &naddr->netid_len) < 0)
naddr->netid_len = be32_to_cpup(p++); return nfserr_bad_xdr;
if (naddr->netid_len > RPCBIND_MAXNETIDLEN) if (naddr->netid_len > RPCBIND_MAXNETIDLEN)
goto xdr_error; return nfserr_bad_xdr;
READ_BUF(naddr->netid_len + 4); /* 4 for uaddr len */ p = xdr_inline_decode(argp->xdr, naddr->netid_len);
COPYMEM(naddr->netid, naddr->netid_len); if (!p)
return nfserr_bad_xdr;
memcpy(naddr->netid, p, naddr->netid_len);
naddr->addr_len = be32_to_cpup(p++); if (xdr_stream_decode_u32(argp->xdr, &naddr->addr_len) < 0)
return nfserr_bad_xdr;
if (naddr->addr_len > RPCBIND_MAXUADDRLEN) if (naddr->addr_len > RPCBIND_MAXUADDRLEN)
goto xdr_error; return nfserr_bad_xdr;
READ_BUF(naddr->addr_len); p = xdr_inline_decode(argp->xdr, naddr->addr_len);
COPYMEM(naddr->addr, naddr->addr_len); if (!p)
return nfserr_bad_xdr;
memcpy(naddr->addr, p, naddr->addr_len);
break; break;
default: default:
goto xdr_error; return nfserr_bad_xdr;
} }
DECODE_TAIL;
return nfs_ok;
} }
static __be32 static __be32