Commit bc3665fd authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

lockd: Update the NLMv4 SM_NOTIFY arguments decoder to use struct xdr_stream 



Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent b4c24b5a

fs/lockd/xdr4.c

+26 −13
Original line number Diff line number Diff line
@@ -309,6 +309,32 @@ nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p) 
	return 1;

}



int

nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_reboot *argp = rqstp->rq_argp;

	u32 len;



	if (xdr_stream_decode_u32(xdr, &len) < 0)

		return 0;

	if (len > SM_MAXSTRLEN)

		return 0;

	p = xdr_inline_decode(xdr, len);

	if (!p)

		return 0;

	argp->len = len;

	argp->mon = (char *)p;

	if (xdr_stream_decode_u32(xdr, &argp->state) < 0)

		return 0;

	p = xdr_inline_decode(xdr, SM_PRIV_SIZE);

	if (!p)

		return 0;

	memcpy(&argp->priv.data, p, sizeof(argp->priv.data));



	return 1;

}



int

nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p)

{
@@ -376,19 +402,6 @@ nlm4svc_decode_notify(struct svc_rqst *rqstp, __be32 *p) 
	return xdr_argsize_check(rqstp, p);

}



int

nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_reboot *argp = rqstp->rq_argp;



	if (!(p = xdr_decode_string_inplace(p, &argp->mon, &argp->len, SM_MAXSTRLEN)))

		return 0;

	argp->state = ntohl(*p++);

	memcpy(&argp->priv.data, p, sizeof(argp->priv.data));

	p += XDR_QUADLEN(SM_PRIV_SIZE);

	return xdr_argsize_check(rqstp, p);

}



int

nlm4svc_encode_void(struct svc_rqst *rqstp, __be32 *p)

{