]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
svcrdma: Don't leak send_ctxt on Send errors
authorChuck Lever <chuck.lever@oracle.com>
Tue, 13 Apr 2021 21:53:22 +0000 (17:53 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 May 2021 09:43:47 +0000 (11:43 +0200)
[ Upstream commit 351461f332db5670056a9c6bce6916027f91072f ]

Address a rare send_ctxt leak in the svc_rdma_sendto() error paths.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/sunrpc/xprtrdma/svc_rdma_sendto.c

index 52c759a8543ec86b96e6ba92d18c4cad6cea61c6..3669661457c15d101074b87271b42f687f130ee7 100644 (file)
@@ -958,7 +958,7 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
        p = xdr_reserve_space(&sctxt->sc_stream,
                              rpcrdma_fixed_maxsz * sizeof(*p));
        if (!p)
-               goto err0;
+               goto err1;
 
        ret = svc_rdma_send_reply_chunk(rdma, rctxt, &rqstp->rq_res);
        if (ret < 0)
@@ -970,11 +970,11 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
        *p = pcl_is_empty(&rctxt->rc_reply_pcl) ? rdma_msg : rdma_nomsg;
 
        if (svc_rdma_encode_read_list(sctxt) < 0)
-               goto err0;
+               goto err1;
        if (svc_rdma_encode_write_list(rctxt, sctxt) < 0)
-               goto err0;
+               goto err1;
        if (svc_rdma_encode_reply_chunk(rctxt, sctxt, ret) < 0)
-               goto err0;
+               goto err1;
 
        ret = svc_rdma_send_reply_msg(rdma, sctxt, rctxt, rqstp);
        if (ret < 0)