* [PATCH v2 0/4] isert: the commands the target core allocates itself
@ 2026-11-18 11:39 Yehyeong Lee
2026-11-18 11:39 ` [PATCH v2 1/4] scsi: target: iscsi: match a NOP-In by opcode as well as by tag Yehyeong Lee
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Yehyeong Lee @ 2026-11-18 11:39 UTC (permalink / raw)
To: sagi, jgg, leon, mkp; +Cc: linux-rdma, target-devel, linux-scsi, linux-kernel
v1 was two isert patches with no cover letter:
https://lore.kernel.org/all/20261116101108.1650132-1-yhlee@isslab.korea.ac.kr/
Answering the review of v1 1/2 needs two patches in the target core, so v2
has four. 1/4 and 2/4 are drivers/target/iscsi and 3/4 and 4/4 are
drivers/infiniband/ulp/isert, but 3/4 depends on 1/4: it lets a Reject the
core allocated reach the wire, and without 1/4 first that turns a NULL
dereference into a double free. No intermediate commit has a double free
or a use-after-free; the NULL dereference is in the base tree, and 3/4
removes it.
1/4 is not about iSER. iscsit_find_cmd_from_ttt() matches a command by
targ_xfer_tag alone, so a NOP-Out with a reserved ITT and TTT 0 is given
the Reject the core allocated, which carries TTT 0 and is still waiting to
be sent, and two such NOP-Outs free it twice. That is reachable on plain
iscsi_tcp one PDU after login. It also gives the lookup's other caller,
iscsit_handle_data_ack(), the kind of command it actually wants.
2/4 keeps the unsolicited NOP-In off iSER. The transport check in
iscsi_post_login_start_timers() runs once, at login, and
iscsit_process_nop_out() and iscsit_na_nopin_timeout() arm the nopin timer
again on a connection that is already logged in, so it moves into
__iscsit_start_nopin_timer(), which all three go through. Gating it is the
fix rather than only the dereference because isert releases a command on
its Send completion, so the answer to a NOP-In cannot be matched to it.
3/4 is v1's 1/2 with the fix generalised. struct isert_cmd is all zero for
a command the core allocated, so the back pointers are filled in where the
core hands one over, in isert_immediate_queue() and isert_response_queue(),
which also covers the ISTATE_REMOVE the review pointed at.
4/4 is v1's 2/2, unchanged.
Measured on a LIO target with KASAN, one fresh boot per cell, arms
alternating; 2 boots per intermediate stage and 5 for the finished series,
on an iSER portal over soft-RoCE:
base 1/4 1-2/4 1-3/4 1-4/4
Reject + NOP-Out with a
reserved ITT and TTT 0 Oops Oops Oops clean clean
the same two PDUs paced Oops Oops Oops clean clean
nopin_timeout 0 then 3 on a
logged-in iSER session Oops Oops clean clean clean
200 Data-Outs with a
nonexistent ITT 128 128 128 128 200
one Data-Out over Target-
RecvDataSegmentLength - - - - clean
login, WRITE, READ verify,
unsolicited Data-Out, logout - - - - 10/10
Every cell of the finished series is KASAN-clean: 0 reports in 30 cells.
On plain iscsi_tcp, 20 Data-Out/NOP-Out(TTT 0) pairs in one write give 19
or 20 KASAN reports per cell on base, 5 cells out of 5, and 0 with 1/4.
Regression on iscsi_tcp, base against the finished series: the nopin timer
still fires and its answer is still matched, 5 cells each, and login, READ,
WRITE, readback, logout and a CHAP login all pass with no splat.
Still open: iscsit_handle_data_ack() is the one caller whose wanted kind I
could not exercise, so that hunk of 1/4 rests on the code alone.
Yehyeong Lee (4):
scsi: target: iscsi: match a NOP-In by opcode as well as by tag
scsi: target: iscsi: do not arm the nopin timer on an iSER connection
IB/isert: finish a Reject the target core allocated itself
IB/isert: do not leak the receive descriptor of a dropped Data-Out
drivers/infiniband/ulp/isert/ib_isert.c | 41 +++++++++++++++++------
drivers/target/iscsi/iscsi_target.c | 3 +-
drivers/target/iscsi/iscsi_target_erl1.c | 2 +-
drivers/target/iscsi/iscsi_target_login.c | 5 ---
drivers/target/iscsi/iscsi_target_util.c | 16 +++++++--
drivers/target/iscsi/iscsi_target_util.h | 4 ++-
6 files changed, 51 insertions(+), 20 deletions(-)
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/4] scsi: target: iscsi: match a NOP-In by opcode as well as by tag
2026-11-18 11:39 [PATCH v2 0/4] isert: the commands the target core allocates itself Yehyeong Lee
@ 2026-11-18 11:39 ` Yehyeong Lee
2026-11-18 12:07 ` sashiko-bot
2026-11-18 11:39 ` [PATCH v2 2/4] scsi: target: iscsi: do not arm the nopin timer on an iSER connection Yehyeong Lee
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Yehyeong Lee @ 2026-11-18 11:39 UTC (permalink / raw)
To: sagi, jgg, leon, mkp; +Cc: linux-rdma, target-devel, linux-scsi, linux-kernel
iscsit_find_cmd_from_ttt() returns the first command on the connection
whose targ_xfer_tag matches, whatever kind of command it is. Its two
callers each want one kind: iscsit_process_nop_out() wants the NOP-In the
target sent, so that a NOP-Out carrying its TTT retires it, and
iscsit_handle_data_ack() wants the SCSI command a Data-In belongs to.
A Reject the target core allocates itself is zeroed by
iscsit_allocate_cmd(), so its targ_xfer_tag is 0, and it is on
conn_cmd_list before it is sent. A NOP-Out with a reserved ITT and TTT 0
is therefore given that Reject, and iscsit_process_nop_out() queues it
with ISTATE_REMOVE on the immediate queue. The rx thread does that; the
tx thread is what takes the command off conn_cmd_list and frees it, so a
second such NOP-Out can be given the same command before the tx thread
has got to the first one, and it is freed twice. Such a command has no
se_cmd, so iscsit_free_cmd() releases it on the spot.
An initiator reaches this over plain iscsi_tcp one PDU after login.
iscsit_check_dataout_hdr() rejects a Data-Out whose DataSegmentLength
exceeds MaxXmitDataSegmentLength without dumping the payload, and
iscsit_handle_data_out() throws away the error it returns, so the receive
loop reads on and takes the next 48 bytes on the wire as the next BHS.
Twenty Data-Out/NOP-Out pairs in one write give 19 or 20 KASAN reports,
in 5 boots out of 5:
[ 10.546883] ==================================================================
[ 10.546895] BUG: KASAN: double-free in iscsit_release_cmd+0xff/0x390
[ 10.546957] Free of addr ffff88800e5d1680 by task iscsi_ttx/140
[ 10.546964]
[ 10.546976] CPU: 0 UID: 0 PID: 140 Comm: iscsi_ttx Not tainted 7.4.0-rc2-RJ9TA-00716-g23c62304dde2 #1 PREEMPT(lazy)
[ 10.546989] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2 04/01/2014
[ 10.546997] Call Trace:
[ 10.547002] <TASK>
[ 10.547008] dump_stack_lvl+0x66/0xa0
[ 10.547023] print_report+0xd0/0x630
[ 10.547040] ? iscsit_release_cmd+0xff/0x390
[ 10.547049] ? iscsit_release_cmd+0xff/0x390
[ 10.547057] ? __virt_addr_valid+0x209/0x3f0
[ 10.547071] ? iscsit_release_cmd+0xff/0x390
[ 10.547079] ? iscsit_release_cmd+0xff/0x390
[ 10.547087] kasan_report_invalid_free+0xb8/0xe0
[ 10.547100] ? iscsit_release_cmd+0xff/0x390
[ 10.547110] ? iscsit_release_cmd+0xff/0x390
[ 10.547119] check_slab_allocation+0xd9/0x100
[ 10.547131] kfree+0x163/0x510
[ 10.547147] iscsit_release_cmd+0xff/0x390
[ 10.547156] iscsit_immediate_queue+0x17a/0xa90
[ 10.547167] ? kmem_cache_free+0x1fe/0x500
[ 10.547176] ? iscsit_get_cmd_from_immediate_queue+0x189/0x210
[ 10.547187] iscsi_target_tx_thread+0x34d/0x700
[ 10.547201] ? __kthread_parkme+0x9f/0x1f0
[ 10.547213] ? __pfx_iscsi_target_tx_thread+0x10/0x10
[ 10.547227] ? __pfx_autoremove_wake_function+0x10/0x10
[ 10.547241] ? __kthread_parkme+0xac/0x1f0
[ 10.547251] ? __pfx_iscsi_target_tx_thread+0x10/0x10
[ 10.547263] kthread+0x300/0x400
[ 10.547274] ? __pfx_kthread+0x10/0x10
[ 10.547285] ret_from_fork+0x52e/0x780
[ 10.547297] ? __pfx_ret_from_fork+0x10/0x10
[ 10.547307] ? __switch_to+0x572/0xdd0
[ 10.547321] ? __pfx_kthread+0x10/0x10
[ 10.547332] ret_from_fork_asm+0x1a/0x30
[ 10.547352] </TASK>
[ 10.547357]
[ 10.547359] Allocated by task 141:
[ 10.547366] kasan_save_stack+0x33/0x60
[ 10.547379] kasan_save_track+0x14/0x30
[ 10.547388] __kasan_kmalloc+0x8f/0xa0
[ 10.547397] __kmalloc_node_track_caller_noprof+0x26d/0x680
[ 10.547409] kmemdup_noprof+0x20/0x50
[ 10.550518] iscsit_add_reject+0x99/0x2b0
[ 10.550532] iscsit_check_dataout_hdr+0x26d/0x360
[ 10.550542] iscsit_get_rx_pdu+0x5da/0x35d0
[ 10.550552] iscsi_target_rx_thread+0x132/0x2f0
[ 10.550563] kthread+0x300/0x400
[ 10.550573] ret_from_fork+0x52e/0x780
[ 10.550582] ret_from_fork_asm+0x1a/0x30
[ 10.550593]
[ 10.550596] Freed by task 140:
[ 10.550603] kasan_save_stack+0x33/0x60
[ 10.550615] kasan_save_track+0x14/0x30
[ 10.550623] kasan_save_free_info+0x3b/0x60
[ 10.550631] __kasan_slab_free+0x43/0x70
[ 10.550640] kfree+0x2e5/0x510
[ 10.550651] iscsit_release_cmd+0xff/0x390
[ 10.550659] iscsit_immediate_queue+0x17a/0xa90
[ 10.550669] iscsi_target_tx_thread+0x34d/0x700
[ 10.550679] kthread+0x300/0x400
[ 10.550688] ret_from_fork+0x52e/0x780
[ 10.550696] ret_from_fork_asm+0x1a/0x30
[ 10.550706]
[ 10.550710] The buggy address belongs to the object at ffff88800e5d1680
[ 10.550710] which belongs to the cache kmalloc-64 of size 64
[ 10.550719] The buggy address is located 0 bytes inside of
[ 10.550719] 64-byte region [ffff88800e5d1680, ffff88800e5d16c0)
[ 10.550729]
[ 10.550734] The buggy address belongs to the physical page:
[ 10.550743] page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0xe5d1
[ 10.550753] flags: 0x100000000000000(node=0|zone=1)
[ 10.550763] page_type: f5(slab)
[ 10.550776] raw: 0100000000000000 ffff888008c428c0 dead000000000100 dead000000000122
[ 10.550785] raw: 0000000000000000 0000000000200020 00000000f5000000 0000000000000000
[ 10.550790] page dumped because: kasan: bad access detected
[ 10.550794]
[ 10.550796] Memory state around the buggy address:
[ 10.550801] ffff88800e5d1580: 00 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc
[ 10.550808] ffff88800e5d1600: 00 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc
[ 10.550813] >ffff88800e5d1680: fa fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
[ 10.550818] ^
[ 10.550823] ffff88800e5d1700: fa fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
[ 10.550829] ffff88800e5d1780: fa fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
[ 10.550834] ==================================================================
The same shape was reported in 2015 and fixed by taking one holder of
TTT 0 away rather than by looking at the kind of command. A Test Unit
Ready left at TTT 0 was being matched to the session's first NOP-In and
queued for removal twice, so every non-READ SCSI command was given
0xFFFFFFFF instead:
commit 9547308bda29 ("target/iscsi: Fix double free of a TUR followed by a solicited NOPOUT").
The Reject and the first READ of a session still carry TTT 0.
Pass the opcode the caller is after and compare it too. The test belongs
in the loop rather than at the caller: at the caller, a Reject or a first
READ standing earlier on conn_cmd_list would mask a NOP-In holding the
same TTT, and its answer would be dropped.
Link: https://lore.kernel.org/all/1437516477-30554-4-git-send-email-sbaugh@catern.com/
Fixes: e48354ce078c ("iscsi-target: Add iSCSI fabric support for target v4.1")
Cc: stable@vger.kernel.org
Signed-off-by: Yehyeong Lee <yhlee@isslab.korea.ac.kr>
---
drivers/target/iscsi/iscsi_target.c | 3 ++-
drivers/target/iscsi/iscsi_target_erl1.c | 2 +-
drivers/target/iscsi/iscsi_target_util.c | 6 ++++--
drivers/target/iscsi/iscsi_target_util.h | 4 +++-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 124ff269b8e759..2762a60ec3b33d 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -1821,7 +1821,8 @@ int iscsit_process_nop_out(struct iscsit_conn *conn, struct iscsit_cmd *cmd,
* This was a response to a unsolicited NOPIN ping.
*/
if (hdr->ttt != cpu_to_be32(0xFFFFFFFF)) {
- cmd_p = iscsit_find_cmd_from_ttt(conn, be32_to_cpu(hdr->ttt));
+ cmd_p = iscsit_find_cmd_from_ttt(conn, be32_to_cpu(hdr->ttt),
+ ISCSI_OP_NOOP_IN);
if (!cmd_p)
return -EINVAL;
diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index d8ca06e697d63f..74dc218716f2ad 100644
--- a/drivers/target/iscsi/iscsi_target_erl1.c
+++ b/drivers/target/iscsi/iscsi_target_erl1.c
@@ -536,7 +536,7 @@ int iscsit_handle_data_ack(
{
struct iscsit_cmd *cmd = NULL;
- cmd = iscsit_find_cmd_from_ttt(conn, targ_xfer_tag);
+ cmd = iscsit_find_cmd_from_ttt(conn, targ_xfer_tag, ISCSI_OP_SCSI_CMD);
if (!cmd) {
pr_err("Data ACK SNACK for TTT: 0x%08x is"
" invalid.\n", targ_xfer_tag);
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index c1888c42afdd5e..9ee1b5fcf5059f 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -383,13 +383,15 @@ EXPORT_SYMBOL(iscsit_find_cmd_from_itt_or_dump);
struct iscsit_cmd *iscsit_find_cmd_from_ttt(
struct iscsit_conn *conn,
- u32 targ_xfer_tag)
+ u32 targ_xfer_tag,
+ u8 iscsi_opcode)
{
struct iscsit_cmd *cmd = NULL;
spin_lock_bh(&conn->cmd_lock);
list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) {
- if (cmd->targ_xfer_tag == targ_xfer_tag) {
+ if (cmd->iscsi_opcode == iscsi_opcode &&
+ cmd->targ_xfer_tag == targ_xfer_tag) {
spin_unlock_bh(&conn->cmd_lock);
return cmd;
}
diff --git a/drivers/target/iscsi/iscsi_target_util.h b/drivers/target/iscsi/iscsi_target_util.h
index 7ae48a8a5cbf0b..56487d15ed80d4 100644
--- a/drivers/target/iscsi/iscsi_target_util.h
+++ b/drivers/target/iscsi/iscsi_target_util.h
@@ -25,7 +25,9 @@ extern int iscsit_sequence_cmd(struct iscsit_conn *conn, struct iscsit_cmd *cmd,
unsigned char * ,__be32 cmdsn);
extern struct iscsit_cmd *iscsit_find_cmd_from_itt_or_dump(struct iscsit_conn *,
itt_t, u32);
-extern struct iscsit_cmd *iscsit_find_cmd_from_ttt(struct iscsit_conn *, u32);
+extern struct iscsit_cmd *iscsit_find_cmd_from_ttt(struct iscsit_conn *conn,
+ u32 targ_xfer_tag,
+ u8 iscsi_opcode);
extern int iscsit_find_cmd_for_recovery(struct iscsit_session *, struct iscsit_cmd **,
struct iscsi_conn_recovery **, itt_t);
extern void iscsit_add_cmd_to_immediate_queue(struct iscsit_cmd *, struct iscsit_conn *, u8);
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/4] scsi: target: iscsi: do not arm the nopin timer on an iSER connection
2026-11-18 11:39 [PATCH v2 0/4] isert: the commands the target core allocates itself Yehyeong Lee
2026-11-18 11:39 ` [PATCH v2 1/4] scsi: target: iscsi: match a NOP-In by opcode as well as by tag Yehyeong Lee
@ 2026-11-18 11:39 ` Yehyeong Lee
2026-11-18 11:39 ` [PATCH v2 3/4] IB/isert: finish a Reject the target core allocated itself Yehyeong Lee
2026-11-18 11:39 ` [PATCH v2 4/4] IB/isert: do not leak the receive descriptor of a dropped Data-Out Yehyeong Lee
3 siblings, 0 replies; 6+ messages in thread
From: Yehyeong Lee @ 2026-11-18 11:39 UTC (permalink / raw)
To: sagi, jgg, leon, mkp; +Cc: linux-rdma, target-devel, linux-scsi, linux-kernel
iscsi_post_login_start_timers() does not arm the nopin timer for
ISCSI_INFINIBAND, under a FIXME that says unsolicited NOP-In is not
supported there. It is the only place that looks at the transport, and it
runs once, at login. Two other sites arm the same timer for a connection
that is already logged in: iscsit_process_nop_out() after a NOP-Out
response, and iscsit_na_nopin_timeout() for every logged-in connection of
an ACL whose nopin_timeout is written from 0 to a non-zero value.
So an iSER connection does get unsolicited NOP-Ins, and iscsit_add_nopin()
builds them from a command of its own. Writing nopin_timeout 0 and then 3
on the ACL of a logged-in iSER session kills the target on unmodified
mainline: struct isert_cmd is all zero for such a command, and
isert_put_nopin() hands the NULL receive descriptor to isert_post_recv(),
which dereferences it. That part is a bug in isert and is fixed two
patches on.
[ 7.760642] Oops: general protection fault, probably for non-canonical address 0xdffffc0000000484: 0000 [#1] SMP KASAN NOPTI
[ 7.763622] KASAN: probably user-memory-access in range [0x0000000000002420-0x0000000000002427]
[ 7.765384] CPU: 0 UID: 0 PID: 175 Comm: iscsi_ttx Not tainted 7.4.0-rc2-RJ7A-00716-g23c62304dde2 #15 PREEMPT(lazy)
[ 7.767152] Hardware name: QEMU Ubuntu 24.04 PC v2 (i440FX + PIIX, arch_caps fix, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014
[ 7.768831] RIP: 0010:isert_post_recv+0x98/0x210
[ 7.769516] Code: 89 f8 48 c7 44 24 48 00 00 00 00 48 c7 44 24 50 00 00 00 00 48 c1 e8 03 48 c7 44 24 58 00 00 00 00 48 c7 44 24 60 00 00 00 00 <0f> b6 04 10 84 c0 74 06 0f 8e 2c 01 00 00 31 ed 80 be 20 24 00 00
[ 7.771842] RSP: 0018:ffff888104f67c10 EFLAGS: 00010206
[ 7.772484] RAX: 0000000000000484 RBX: 1ffff110209ecf83 RCX: 0000000000000000
[ 7.773332] RDX: dffffc0000000000 RSI: 0000000000000000 RDI: 0000000000002420
[ 7.774172] RBP: ffff888104f8c980 R08: 00000000000002bc R09: 0000000000000001
[ 7.775024] R10: ffff888104f26447 R11: 000000005436c6f6 R12: ffff888104af8000
[ 7.775843] R13: ffff888104af8000 R14: ffff888104b55000 R15: ffff888104f8c500
[ 7.776657] FS: 0000000000000000(0000) GS:ffff88816105d000(0000) knlGS:0000000000000000
[ 7.777558] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 7.778220] CR2: 00007f221cf10000 CR3: 0000000104e1f005 CR4: 0000000000770ef0
[ 7.779031] PKRU: 55555554
[ 7.779360] Call Trace:
[ 7.779654] <TASK>
[ 7.779916] ? __pfx_isert_post_recv+0x10/0x10
[ 7.780460] isert_post_response+0x85/0x1b0
[ 7.780928] ? __pfx_isert_post_response+0x10/0x10
[ 7.781455] ? isert_put_nopin+0xcb/0x3d0
[ 7.781898] iscsi_target_tx_thread+0x33c/0x6f0
[ 7.782411] ? __pfx_iscsi_target_tx_thread+0x10/0x10
[ 7.782983] ? _raw_spin_lock_irq+0x10/0xe0
[ 7.783461] ? __pfx_autoremove_wake_function+0x10/0x10
[ 7.784043] ? __pfx_kthread_affine_node+0x10/0x10
[ 7.784574] ? __kthread_parkme+0x88/0x170
[ 7.785024] ? __pfx_iscsi_target_tx_thread+0x10/0x10
[ 7.785577] ? __pfx_iscsi_target_tx_thread+0x10/0x10
[ 7.786120] kthread+0x2c8/0x3b0
[ 7.786487] ? recalc_sigpending+0x15c/0x1e0
[ 7.786980] ? __pfx_kthread+0x10/0x10
[ 7.787404] ret_from_fork+0x36e/0x5a0
[ 7.787831] ? __pfx_ret_from_fork+0x10/0x10
[ 7.788303] ? __switch_to+0x572/0xdc0
[ 7.788725] ? __pfx_kthread+0x10/0x10
[ 7.789137] ret_from_fork_asm+0x1a/0x30
[ 7.789573] </TASK>
[ 7.789824] Modules linked in:
[ 7.790190] ---[ end trace 0000000000000000 ]---
What cannot be fixed there is the answer. isert releases a command when
its Send completes - isert_send_done() ends in isert_put_cmd() for every
state it does not special-case - so by the time the initiator's NOP-Out
arrives the NOP-In is no longer on conn->conn_cmd_list, and
iscsit_find_cmd_from_ttt() cannot match it:
Unable to locate TTT: 0x00000000 on CID: 0
Did not receive response to NOPIN on CID: 0, failing connection for
I_T Nexus iqn.2026-07.repro:init,...
The nopin response timer then expires and the connection is reinstated,
once per nopin_timeout, in 5 boots out of 5. Keeping the command alive
across the Send completion is isert's business and is more than a
dereference fix, so until it is done, make the transport check hold for
the whole life of the connection instead of only at login: move it into
__iscsit_start_nopin_timer(), which all three arming sites go through.
David Jeffery's 2022 series went the other way - it wanted the unsolicited
NOP-In on isert, for a different reason, and did the rest of the work for
it - but it was not applied, and even that series does not cover the
want_response case the nopin timer produces.
Link: https://lore.kernel.org/all/20220311175713.2344960-1-djeffery@redhat.com/
Fixes: b8d26b3be8b3 ("iser-target: Add iSCSI Extensions for RDMA (iSER) target driver")
Cc: stable@vger.kernel.org
Signed-off-by: Yehyeong Lee <yhlee@isslab.korea.ac.kr>
---
drivers/target/iscsi/iscsi_target_login.c | 5 -----
drivers/target/iscsi/iscsi_target_util.c | 10 ++++++++++
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index c282b6a7029684..08da40534d2e77 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -587,11 +587,6 @@ int iscsi_login_post_auth_non_zero_tsih(
static void iscsi_post_login_start_timers(struct iscsit_conn *conn)
{
struct iscsit_session *sess = conn->sess;
- /*
- * FIXME: Unsolicited NopIN support for ISER
- */
- if (conn->conn_transport->transport_type == ISCSI_INFINIBAND)
- return;
if (!sess->sess_ops->SessionType)
iscsit_start_nopin_timer(conn);
diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index 9ee1b5fcf5059f..fa585b01bcdab6 100644
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -964,6 +964,16 @@ void __iscsit_start_nopin_timer(struct iscsit_conn *conn)
lockdep_assert_held(&conn->nopin_timer_lock);
+ /*
+ * FIXME: Unsolicited NopIN support for ISER
+ *
+ * iscsit_add_nopin() builds the NOP-In from a command the core
+ * allocated itself, and isert releases such a command on the send
+ * completion, so the answer could not be matched back to it.
+ */
+ if (conn->conn_transport->transport_type == ISCSI_INFINIBAND)
+ return;
+
/*
* NOPIN timeout is disabled.
*/
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/4] IB/isert: finish a Reject the target core allocated itself
2026-11-18 11:39 [PATCH v2 0/4] isert: the commands the target core allocates itself Yehyeong Lee
2026-11-18 11:39 ` [PATCH v2 1/4] scsi: target: iscsi: match a NOP-In by opcode as well as by tag Yehyeong Lee
2026-11-18 11:39 ` [PATCH v2 2/4] scsi: target: iscsi: do not arm the nopin timer on an iSER connection Yehyeong Lee
@ 2026-11-18 11:39 ` Yehyeong Lee
2026-11-18 11:39 ` [PATCH v2 4/4] IB/isert: do not leak the receive descriptor of a dropped Data-Out Yehyeong Lee
3 siblings, 0 replies; 6+ messages in thread
From: Yehyeong Lee @ 2026-11-18 11:39 UTC (permalink / raw)
To: sagi, jgg, leon, mkp; +Cc: linux-rdma, target-devel, linux-scsi, linux-kernel
iscsit_add_reject() builds the Reject from a command of its own, with
iscsit_allocate_cmd(), and iscsit_allocate_cmd() zeroes sizeof(struct
iscsit_cmd) plus the transport's priv_size. For iSER that zeroes struct
isert_cmd too, so conn, iscsit_cmd and rx_desc are all NULL where
isert_allocate_cmd() would have filled them in. The command then reaches
the tx thread like any other, and two things go wrong with it.
isert_put_reject() hands the NULL descriptor to isert_post_recv(), which
dereferences it. One PDU after login is enough:
iscsit_check_dataout_hdr() answers a Data-Out whose DataSegmentLength
exceeds conn_ops->MaxXmitDataSegmentLength that way, and it does so
before it looks the ITT up, so there is no SCSI command involved. With
TargetRecvDataSegmentLength negotiated down to 512 and one Data-Out
declaring and carrying 1024 bytes, 5 boots out of 5:
[ 3.657391] Oops: general protection fault, probably for non-canonical address 0xdffffc0000000484: 0000 [#1] SMP KASAN NOPTI
[ 3.660192] KASAN: probably user-memory-access in range [0x0000000000002420-0x0000000000002427]
[ 3.661302] CPU: 0 UID: 0 PID: 168 Comm: iscsi_ttx Not tainted 7.4.0-rc2-RJ7A-00716-g23c62304dde2 #15 PREEMPT(lazy)
[ 3.662601] Hardware name: QEMU Ubuntu 24.04 PC v2 (i440FX + PIIX, arch_caps fix, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014
[ 3.664015] RIP: 0010:isert_post_recv+0x98/0x210
[ 3.664623] Code: 89 f8 48 c7 44 24 48 00 00 00 00 48 c7 44 24 50 00 00 00 00 48 c1 e8 03 48 c7 44 24 58 00 00 00 00 48 c7 44 24 60 00 00 00 00 <0f> b6 04 10 84 c0 74 06 0f 8e 2c 01 00 00 31 ed 80 be 20 24 00 00
[ 3.666840] RSP: 0018:ffff888109437c10 EFLAGS: 00010206
[ 3.667470] RAX: 0000000000000484 RBX: 1ffff11021286f83 RCX: 0000000000000001
[ 3.668323] RDX: dffffc0000000000 RSI: 0000000000000000 RDI: 0000000000002420
[ 3.669134] RBP: ffff888109440480 R08: 00000000000002ac R09: 0000000000000001
[ 3.669943] R10: ffff888104f99447 R11: 00000000a4c8e811 R12: ffff888109404000
[ 3.670752] R13: ffff888109404000 R14: ffff888104d8e000 R15: ffff888109440000
[ 3.671552] FS: 0000000000000000(0000) GS:ffff88817605d000(0000) knlGS:0000000000000000
[ 3.672458] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 3.673086] CR2: 00007fe324237000 CR3: 0000000104f45002 CR4: 0000000000770ef0
[ 3.673857] PKRU: 55555554
[ 3.674160] Call Trace:
[ 3.674442] <TASK>
[ 3.674686] ? __pfx_isert_post_recv+0x10/0x10
[ 3.675178] isert_post_response+0x85/0x1b0
[ 3.675632] ? __pfx_isert_post_response+0x10/0x10
[ 3.676163] ? isert_response_queue+0x91d/0x19a0
[ 3.676664] iscsi_target_tx_thread+0x3de/0x6f0
[ 3.677163] ? __pfx_iscsi_target_tx_thread+0x10/0x10
[ 3.677694] ? _raw_spin_lock_irq+0x10/0xe0
[ 3.678155] ? __pfx_autoremove_wake_function+0x10/0x10
[ 3.678697] ? __pfx_kthread_affine_node+0x10/0x10
[ 3.679195] ? __kthread_parkme+0x88/0x170
[ 3.679617] ? __pfx_iscsi_target_tx_thread+0x10/0x10
[ 3.680142] ? __pfx_iscsi_target_tx_thread+0x10/0x10
[ 3.680663] kthread+0x2c8/0x3b0
[ 3.681011] ? recalc_sigpending+0x15c/0x1e0
[ 3.681457] ? __pfx_kthread+0x10/0x10
[ 3.681851] ret_from_fork+0x36e/0x5a0
[ 3.682244] ? __pfx_ret_from_fork+0x10/0x10
[ 3.682687] ? __switch_to+0x572/0xdc0
[ 3.683085] ? __pfx_kthread+0x10/0x10
[ 3.683481] ret_from_fork_asm+0x1a/0x30
[ 3.683900] </TASK>
[ 3.684139] Modules linked in:
[ 3.684552] ---[ end trace 0000000000000000 ]---
The tx thread dies there, and the teardown that follows walks into the
connection it was using: a KASAN slab-use-after-free in do_send_sig_info()
from iscsit_cause_connection_reinstatement(), a refcount warning in
iscsit_close_connection() and a second Oops in kthread_stop().
The Reject also stays on conn->conn_cmd_list until it is sent, so the core
can hand it to isert_immediate_queue() with ISTATE_REMOVE instead, where
isert_put_cmd() reads isert_cmd->iscsit_cmd and isert_cmd->conn and finds
the same two NULL pointers. Before the first patch of this series that
happened on these very two PDUs, because a NOP-Out with a reserved ITT and
TTT 0 matched the Reject on its tag alone.
So fill the two back pointers in where the core hands a command over -
isert_immediate_queue() and isert_response_queue(), which covers every
state including ISTATE_REMOVE - and let isert_post_recv() accept a
command that has no receive descriptor, beside the already-reposted case
it tolerates today. For a command isert allocated the stores write back
what isert_allocate_cmd() already put there; rx_desc is not touched, so a
command that owns a descriptor keeps it. isert_put_cmd()'s
ISCSI_OP_REJECT arm is already written for a command whose se_cmd was
never set up - it releases one through iscsit_release_cmd() - it was
simply never reached.
The unsolicited NOP-In is the same shape, from iscsit_add_nopin(), and is
kept off iSER by the previous patch.
Filling the back pointers in for a command that did not come through
isert_allocate_cmd() is David Jeffery's idea, from a 2022 series that was
not applied; it did it in isert_put_nopin().
Link: https://lore.kernel.org/all/20220311175713.2344960-2-djeffery@redhat.com/
Fixes: 4366b19ca5eb ("iser-target: Change the recv buffers posting logic")
Cc: stable@vger.kernel.org
Signed-off-by: Yehyeong Lee <yhlee@isslab.korea.ac.kr>
---
drivers/infiniband/ulp/isert/ib_isert.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index efa8d7b7844c97..b7dcfc5f88b916 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -758,7 +758,8 @@ isert_post_recv(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc)
struct ib_recv_wr rx_wr;
int ret;
- if (!rx_desc->in_use) {
+ /* A command the target core allocated itself has no descriptor. */
+ if (!rx_desc || !rx_desc->in_use) {
/*
* if the descriptor is not in-use we already reposted it
* for recv, so just silently return
@@ -1028,6 +1029,18 @@ isert_rx_login_req(struct isert_conn *isert_conn)
queue_delayed_work(isert_login_wq, &conn->login_work, 0);
}
+/*
+ * A command the target core allocated itself does not come through
+ * isert_allocate_cmd(), so the tx path has to fill these in.
+ */
+static void
+isert_init_cmd(struct isert_cmd *isert_cmd, struct isert_conn *isert_conn,
+ struct iscsit_cmd *cmd)
+{
+ isert_cmd->conn = isert_conn;
+ isert_cmd->iscsit_cmd = cmd;
+}
+
static struct iscsit_cmd
*isert_allocate_cmd(struct iscsit_conn *conn, struct iser_rx_desc *rx_desc)
{
@@ -1041,8 +1054,7 @@ static struct iscsit_cmd
return NULL;
}
isert_cmd = iscsit_priv_cmd(cmd);
- isert_cmd->conn = isert_conn;
- isert_cmd->iscsit_cmd = cmd;
+ isert_init_cmd(isert_cmd, isert_conn, cmd);
isert_cmd->rx_desc = rx_desc;
return cmd;
@@ -2201,6 +2213,8 @@ isert_immediate_queue(struct iscsit_conn *conn, struct iscsit_cmd *cmd, int stat
struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
int ret = 0;
+ isert_init_cmd(isert_cmd, conn->context, cmd);
+
switch (state) {
case ISTATE_REMOVE:
spin_lock_bh(&conn->cmd_lock);
@@ -2226,6 +2240,8 @@ isert_response_queue(struct iscsit_conn *conn, struct iscsit_cmd *cmd, int state
struct isert_conn *isert_conn = conn->context;
int ret;
+ isert_init_cmd(iscsit_priv_cmd(cmd), isert_conn, cmd);
+
switch (state) {
case ISTATE_SEND_LOGOUTRSP:
ret = isert_put_logout_rsp(cmd, conn);
--
2.43.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 4/4] IB/isert: do not leak the receive descriptor of a dropped Data-Out
2026-11-18 11:39 [PATCH v2 0/4] isert: the commands the target core allocates itself Yehyeong Lee
` (2 preceding siblings ...)
2026-11-18 11:39 ` [PATCH v2 3/4] IB/isert: finish a Reject the target core allocated itself Yehyeong Lee
@ 2026-11-18 11:39 ` Yehyeong Lee
3 siblings, 0 replies; 6+ messages in thread
From: Yehyeong Lee @ 2026-11-18 11:39 UTC (permalink / raw)
To: sagi, jgg, leon, mkp; +Cc: linux-rdma, target-devel, linux-scsi, linux-kernel
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, 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, in 5 boots
out of 5.
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@vger.kernel.org
Signed-off-by: Yehyeong Lee <yhlee@isslab.korea.ac.kr>
---
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 b7dcfc5f88b916..804148ace398aa 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -1141,17 +1141,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, "
@@ -1169,7 +1168,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,
@@ -1180,13 +1180,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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/4] scsi: target: iscsi: match a NOP-In by opcode as well as by tag
2026-11-18 11:39 ` [PATCH v2 1/4] scsi: target: iscsi: match a NOP-In by opcode as well as by tag Yehyeong Lee
@ 2026-11-18 12:07 ` sashiko-bot
0 siblings, 0 replies; 6+ messages in thread
From: sashiko-bot @ 2026-11-18 12:07 UTC (permalink / raw)
To: Yehyeong Lee; +Cc: linux-rdma, target-devel, linux-scsi
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Critical] scsi: target: iscsi: double free of NOP-In in
iscsit_process_nop_out()
--
commit 4b724f8430caaec9358e8c9a8789de674c7d8d78
Author: Yehyeong Lee <yhlee@isslab.korea.ac.kr>
scsi: target: iscsi: match a NOP-In by opcode as well as by tag
This commit updates iscsit_find_cmd_from_ttt() to match commands by both
iSCSI opcode and Target Transfer Tag so that NOP-Out and Data ACK SNACK
handlers only match the command type they expect.
Link: https://lore.kernel.org/all/1437516477-30554-4-git-send-email-sbaugh@catern.com/
> diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
> index 124ff269b8e75..2762a60ec3b33 100644
> --- a/drivers/target/iscsi/iscsi_target.c
> +++ b/drivers/target/iscsi/iscsi_target.c
> @@ -1821,7 +1821,8 @@ int iscsit_process_nop_out(struct iscsit_conn *conn, struct iscsit_cmd *cmd,
> * This was a response to a unsolicited NOPIN ping.
> */
> if (hdr->ttt != cpu_to_be32(0xFFFFFFFF)) {
> - cmd_p = iscsit_find_cmd_from_ttt(conn, be32_to_cpu(hdr->ttt));
> + cmd_p = iscsit_find_cmd_from_ttt(conn, be32_to_cpu(hdr->ttt),
> + ISCSI_OP_NOOP_IN);
> if (!cmd_p)
> return -EINVAL;
[Severity: Critical]
Can back-to-back NOP-Out PDUs carrying a NOP-In's TTT still double free
cmd_p?
An unsolicited NOP-In queued by iscsit_add_nopin() sits on
conn->conn_cmd_list with no se_cmd, and iscsit_find_cmd_from_ttt() returns
it without removing it from conn->conn_cmd_list or invalidating its
targ_xfer_tag under conn->cmd_lock:
rx thread tx thread
iscsit_process_nop_out()
cmd_p = iscsit_find_cmd_from_ttt(...)
cmd_p->i_state = ISTATE_REMOVE
iscsit_add_cmd_to_immediate_queue(cmd_p, ...)
iscsit_process_nop_out()
cmd_p = iscsit_find_cmd_from_ttt(...)
cmd_p->i_state = ISTATE_REMOVE
iscsit_add_cmd_to_immediate_queue(cmd_p, ...)
iscsit_immediate_queue()
list_del_init(&cmd->i_conn_node)
iscsit_free_cmd(cmd, false)
iscsit_immediate_queue()
list_del_init(&cmd->i_conn_node)
iscsit_free_cmd(cmd, false)
<-- double free
Because conn->conn_cmd_list is only updated when the tx thread runs
iscsit_immediate_queue(), sending two NOP-Out responses with the NOP-In's
TTT in one write queues the same ISCSI_OP_NOOP_IN command with
ISTATE_REMOVE twice, causing iscsit_release_cmd() to double free the
command and its session tag (or corrupt a newly allocated command if the
tag was reused in between).
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261118113905.2361969-1-yhlee@isslab.korea.ac.kr?part=1
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-11-18 12:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-18 11:39 [PATCH v2 0/4] isert: the commands the target core allocates itself Yehyeong Lee
2026-11-18 11:39 ` [PATCH v2 1/4] scsi: target: iscsi: match a NOP-In by opcode as well as by tag Yehyeong Lee
2026-11-18 12:07 ` sashiko-bot
2026-11-18 11:39 ` [PATCH v2 2/4] scsi: target: iscsi: do not arm the nopin timer on an iSER connection Yehyeong Lee
2026-11-18 11:39 ` [PATCH v2 3/4] IB/isert: finish a Reject the target core allocated itself Yehyeong Lee
2026-11-18 11:39 ` [PATCH v2 4/4] IB/isert: do not leak the receive descriptor of a dropped Data-Out Yehyeong Lee
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox