rpcrdma_decode_msg: check xdr_inline_decode result
diff mbox series

Message ID 20190724015115.3493-1-navid.emamdoost@gmail.com
State New
Headers show
Series
  • rpcrdma_decode_msg: check xdr_inline_decode result
Related show

Commit Message

Navid Emamdoost July 24, 2019, 1:51 a.m. UTC
xdr_inline_decode may return NULL, so the check is necessary. The base
pointer will be dereferenced later in rpcrdma_inline_fixup.

Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
 net/sunrpc/xprtrdma/rpc_rdma.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Chuck Lever July 24, 2019, 2:02 a.m. UTC | #1
> On Jul 23, 2019, at 9:51 PM, Navid Emamdoost <navid.emamdoost@gmail.com> wrote:
> 
> xdr_inline_decode may return NULL, so the check is necessary. The base
> pointer will be dereferenced later in rpcrdma_inline_fixup.

NACK. When xdr_inline_decode is passed a zero “length” argument, it can never return NULL.


> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
> ---
> net/sunrpc/xprtrdma/rpc_rdma.c | 3 +++
> 1 file changed, 3 insertions(+)
> 
> diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
> index 4345e6912392..d0479efe0e72 100644
> --- a/net/sunrpc/xprtrdma/rpc_rdma.c
> +++ b/net/sunrpc/xprtrdma/rpc_rdma.c
> @@ -1160,6 +1160,9 @@ rpcrdma_decode_msg(struct rpcrdma_xprt *r_xprt, struct rpcrdma_rep *rep,
> 
>    /* Build the RPC reply's Payload stream in rqst->rq_rcv_buf */
>    base = (char *)xdr_inline_decode(xdr, 0);
> +    if (!base)
> +        return -EIO;
> +
>    rpclen = xdr_stream_remaining(xdr);
>    r_xprt->rx_stats.fixup_copy_count +=
>        rpcrdma_inline_fixup(rqst, base, rpclen, writelist & 3);
> -- 
> 2.17.1
>

Patch
diff mbox series

diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
index 4345e6912392..d0479efe0e72 100644
--- a/net/sunrpc/xprtrdma/rpc_rdma.c
+++ b/net/sunrpc/xprtrdma/rpc_rdma.c
@@ -1160,6 +1160,9 @@  rpcrdma_decode_msg(struct rpcrdma_xprt *r_xprt, struct rpcrdma_rep *rep,
 
 	/* Build the RPC reply's Payload stream in rqst->rq_rcv_buf */
 	base = (char *)xdr_inline_decode(xdr, 0);
+	if (!base)
+		return -EIO;
+
 	rpclen = xdr_stream_remaining(xdr);
 	r_xprt->rx_stats.fixup_copy_count +=
 		rpcrdma_inline_fixup(rqst, base, rpclen, writelist & 3);