From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7233D4BEE2C; Sat, 12 Sep 2026 16:17:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789229831; cv=none; b=p59GUJiWOdvMCekOCsLq3yI1ZIkWfwh5chyp5MMuGbrPuAbyuRTpaYgYUQRMCglmFFGGXqWf8pBJsvZ021Q2GSreK65UL2aVmLnLXAAmHLU2itCx5aGuC90AG0FlIxTsGNsn+bzr43K3vgi5fBLAIj1sGX1qzV84EyHQyQ01mgU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789229831; c=relaxed/simple; bh=wF1AEnmkMJ1TzJoDeSbi6lua7PVDsRa7+Qyg8+p9oIc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=io8zttB+fOUwqDt5+Ws0my1nP5mHJneOFcYzT3LD/YD4Bn7CeUgeHMR8gcVaefL+HFHWwid62N9m8MuHLXOkbqYHTMqP739BOq7mTV19yJiq+pPtSBokX6VT13RU3oDJ4TdcrBAejhR4Sq0NV+c4SKvKx1FsH5IKGybw6rDMp78= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dr2i+kqT; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dr2i+kqT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 750171F000FF; Sat, 12 Sep 2026 16:17:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789229830; bh=4ioG2GCDJSWJNVIAitPwbSnMfdaBmtBzoHY362vQG/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dr2i+kqTAy/mlY+gjZG/EQCPgOYz4dS9baSaT+NMUsmTr3f8CPQqa4YCGzkT3TjRN Z5Qf/yHzIkpG5mfXbQEamhN//pY2H0ohgLKhbkSJUX5t7NQ2gWIrCPbHO3I44g/Tr1 y6vSk/bWLnOwGdN5aSE2Pgi7rgl/QWU5ZIhCMoUs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, TanZheng , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.1 0670/1191] RDMA/srpt: Fix srpt_alloc_rw_ctxs() unwind counters Date: Sat, 12 Sep 2026 08:56:38 +0200 Message-ID: <20260912065603.304454660@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: TanZheng [ Upstream commit b38f98e176050850f41bb6415f3a71400056623e ] When srpt_alloc_rw_ctxs() fails partway through a multi-buffer indirect descriptor, the unwind path destroys RDMA contexts but leaves stale n_rw_ctx and n_rdma values (and a dangling rw_ctxs pointer). Later sq_wr_avail accounting in srpt_queue_response() or srpt_write_pending() can then subtract the wrong number of send queue credits. Reset the counters and clear rw_ctxs after freeing the heap allocation before returning an error. Fixes: b99f8e4d7bcd ("IB/srpt: convert to the generic RDMA READ/WRITE API") Signed-off-by: TanZheng Link: https://patch.msgid.link/20260715101550.45345-1-kensanya@163.com Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/ulp/srpt/ib_srpt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index e9ce57a730c02..fd5c4d7f7ed0b 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -959,6 +959,7 @@ static int srpt_alloc_rw_ctxs(struct srpt_send_ioctx *ioctx, struct srpt_rdma_ch *ch = ioctx->ch; struct scatterlist *prev = NULL; unsigned prev_nents; + u8 n_rdma, n_rw_ctx; int ret, i; if (nbufs == 1) { @@ -970,6 +971,9 @@ static int srpt_alloc_rw_ctxs(struct srpt_send_ioctx *ioctx, return -ENOMEM; } + n_rw_ctx = ioctx->n_rw_ctx; + n_rdma = ioctx->n_rdma; + for (i = ioctx->n_rw_ctx; i < nbufs; i++, db++) { struct srpt_rw_ctx *ctx = &ioctx->rw_ctxs[i]; u64 remote_addr = be64_to_cpu(db->va); @@ -1016,6 +1020,9 @@ static int srpt_alloc_rw_ctxs(struct srpt_send_ioctx *ioctx, } if (ioctx->rw_ctxs != &ioctx->s_rw_ctx) kfree(ioctx->rw_ctxs); + ioctx->rw_ctxs = NULL; + ioctx->n_rw_ctx = n_rw_ctx; + ioctx->n_rdma = n_rdma; return ret; } -- 2.53.0