Patch "target/iscsi: Fix double free of a TUR followed by a solicited NOPOUT" has been added to the 4.1-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
target/iscsi: Fix double free of a TUR followed by a solicited NOPOUT
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
target-iscsi-fix-double-free-of-a-tur-followed-by-a-solicited-nopout.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
9547308bda296b6f69876c840a0291fcfbeddbb8Mon Sep 17 00:00:00 2001
From: Alexei Potashnik <[email protected]>
Date: Tue, 21 Jul 2015 15:07:56 -0700
Subject: target/iscsi: Fix double free of a TUR followed by a solicited NOPOUT
From: Alexei Potashnik <[email protected]>
commit 9547308bda296b6f69876c840a0291fcfbeddbb8 upstream.
Make sure all non-READ SCSI commands get targ_xfer_tag initialized to 0xffffffff, not just WRITEs.
Double-free of a TUR cmd object occurs under the following scenario:
1. TUR received (targ_xfer_tag is uninitialized and left at 0)
2. TUR status sent
3. First unsolicited NOPIN is sent to initiator (gets targ_xfer_tag of 0)
4. NOPOUT for NOPIN (with TTT=0) arrives
- its ExpStatSN acks TUR status, TUR is queued for removal
- LIO tries to find NOPIN with TTT=0, but finds the same TUR instead, TUR is queued for removal for the 2nd time
(Drop unbalanced conditional bracket usage - nab)
--- drivers/target/iscsi/iscsi_target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/target/iscsi/iscsi_target.c +2 -2
@@ -968,9 +968,9 @@ int iscsit_setup_scsi_cmd(struct iscsi_c cmd->cmd_flags |=ICF_NON_IMMEDIATE_UNSOLICITED_DATA ; conn->sess->init_task_tag = cmd->init_task_tag = hdr->itt; -if (hdr->flags &ISCSI_FLAG_CMD_READ ) { +if (hdr->flags &ISCSI_FLAG_CMD_READ ) cmd->targ_xfer_tag =session_get_next_ttt (conn->sess); - }else if (hdr->flags &ISCSI_FLAG_CMD_WRITE ) +else cmd->targ_xfer_tag =0xFFFFFFFF ; cmd->cmd_sn =be32_to_cpu (hdr->cmdsn); cmd->exp_stat_sn =be32_to_cpu (hdr->exp_statsn);
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/target-iscsi-fix-double-free-of-a-tur-followed-by-a-solicited-nopout.patch