[PATCH 2/2] IB/isert: do not leak the receive descriptor of a dropped Data-Out
From: Yehyeong Lee
Date: Mon Nov 16 2026 - 05:11:44 EST
isert_handle_iscsi_dataout() works on the command it finds by ITT, which
holds the descriptor of the SCSI Command PDU and not of this Data-Out,
which is why the function posts its own descriptor explicitly when it
succeeds. None of its other returns do, and isert_recv_done() ignores
what the handler returned, so each such Data-Out costs one of the
ISERT_QP_MAX_RECV_DTOS buffers. That includes the returns where
iscsit_check_dataout_hdr() answers 0 without a command at all: 200
Data-Outs carrying an ITT that matches no command stop the connection
after exactly 128 of them, in all 3 runs, with no response to a NOP-Out
sent afterwards and nothing logged beyond the per-PDU "Unable to locate
ITT" message; with this patch all 200 are taken and the NOP-Out is
answered.
So give isert_handle_iscsi_dataout()'s other returns the same post its
success path already does.
That one function only. Everywhere else a handler returns non-zero, the
command isert allocated still holds that descriptor and the response
posts it from isert_post_response(), so re-posting from
isert_recv_done() would post the same descriptor twice; the second post
is skipped only while the descriptor has not been refilled, which is not
something the receive path can promise. iscsit_handle_logout_cmd() even
returns 1 for an ordinary logout.
Fixes: 4366b19ca5eb ("iser-target: Change the recv buffers posting logic")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Yehyeong Lee <yhlee@xxxxxxxxxxxxxxxxxx>
---
drivers/infiniband/ulp/isert/ib_isert.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 81164881dcc241..8a57c880335cc3 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -1130,17 +1130,16 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn,
int rc, sg_nents, sg_off, page_off;
rc = iscsit_check_dataout_hdr(conn, buf, &cmd);
- if (rc < 0)
- return rc;
- else if (!cmd)
- return 0;
+ if (rc < 0 || !cmd)
+ goto repost;
/*
* FIXME: Unexpected unsolicited_data out
*/
if (!cmd->unsolicited_data) {
isert_err("Received unexpected solicited data payload\n");
dump_stack();
- return -1;
+ rc = -1;
+ goto repost;
}
isert_dbg("Unsolicited DataOut unsol_data_len: %u, "
@@ -1158,7 +1157,8 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn,
if (page_off) {
isert_err("unexpected non-page aligned data payload\n");
dump_stack();
- return -1;
+ rc = -1;
+ goto repost;
}
isert_dbg("Copying DataOut: sg_start: %p, sg_off: %u "
"sg_nents: %u from %p %u\n", sg_start, sg_off,
@@ -1169,13 +1169,18 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn,
rc = iscsit_check_dataout_payload(cmd, hdr, false);
if (rc < 0)
- return rc;
+ goto repost;
/*
* multiple data-outs on the same command can arrive -
* so post the buffer before hand
*/
return isert_post_recv(isert_conn, rx_desc);
+
+repost:
+ /* Nothing else owns this Data-Out's receive descriptor. */
+ isert_post_recv(isert_conn, rx_desc);
+ return rc;
}
static int
--
2.43.0