Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ed0ff98 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: Introduce xdr_stream-based decoders for RPCB_UNSET 



Replace the open-coded decode logic for rpcbind UNSET results with an
xdr_stream-based implementation, similar to what NFSv4 uses, to
protect against buffer overflows.

The new function is unused for the moment.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 0d36c4f7

net/sunrpc/rpcb_clnt.c

+22 −0
Original line number Diff line number Diff line
@@ -736,6 +736,28 @@ static int rpcb_decode_set(struct rpc_rqst *req, __be32 *p, 
	return 0;

}



static int rpcb_dec_set(struct rpc_rqst *req, __be32 *p,

			unsigned int *boolp)

{

	struct rpc_task *task = req->rq_task;

	struct xdr_stream xdr;



	xdr_init_decode(&xdr, &req->rq_rcv_buf, p);



	p = xdr_inline_decode(&xdr, sizeof(__be32));

	if (unlikely(p == NULL))

		return -EIO;



	*boolp = 0;

	if (*p)

		*boolp = 1;



	dprintk("RPC: %5u RPCB_%s call %s\n",

			task->tk_pid, task->tk_msg.rpc_proc->p_name,

			(*boolp ? "succeeded" : "failed"));

	return 0;

}



static int encode_rpcb_string(struct xdr_stream *xdr, const char *string,

				const u32 maxstrlen)

{