>From e6e756fa5a7381731d2a11a6eafe0af32ad16f65 Mon Sep 17 00:00:00 2001
From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
Date: Sat, 20 Dec 2008 14:19:23 -0800
Subject: [PATCH 8/8] [LIO-Target]: Fix leakage of ISCSI_INIT_LOGOUT_CMND for CLOSESESSION or same CID CLOSECONNECTION cases
This patch remove the a incorrect special case in iscsi_release_commands_from_conn()
where ISCSI_INIT_LOGOUT_CMND for CLOSESESSION or same CID CLOSECONNECTION was leaking
iscsi_cmd_t assuming that (according to the comment) iscsi_logout_post_handler() would
be releasing iscsi_cmd_t (it never does).
In any event, because of the way that iscsi_handle_logout_cmd() works (it sleeps on
iscsi_conn_t->conn_logout_sem in iscsi_target_rx_thread()), it means that for a
successful logout, iscsi_release_commands_from_conn() will always be called from
iSCSI TX thread context *AFTER* iscsi_logout_post_handler() has been called.
Given this logic, we can safely remove this incorrect special case check in
iscsi_release_commands_from_conn().
Signed-off-by: Nicholas A. Bellinger <nab@xxxxxxxxxxxxxxx>
---
drivers/lio-core/iscsi_target.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/drivers/lio-core/iscsi_target.c b/drivers/lio-core/iscsi_target.c
index d705871..d95a506 100644
--- a/drivers/lio-core/iscsi_target.c
+++ b/drivers/lio-core/iscsi_target.c
@@ -4730,19 +4730,8 @@ static void iscsi_release_commands_from_conn (iscsi_conn_t *conn)
if (!(SE_CMD(cmd)) ||
!(SE_CMD(cmd)->se_cmd_flags & SCF_SE_LUN_CMD)) {
- /*
- * CLOSESESSION and CLOSECONNECTION with a matching
- * logout_cid will be freed in iscsi_logout_post_handler().
- */
- if ((cmd->iscsi_opcode == ISCSI_INIT_LOGOUT_CMND) &&
- ((cmd->logout_reason == CLOSESESSION) ||
- ((cmd->logout_reason == CLOSECONNECTION) &&
- (cmd->logout_cid == conn->cid)))) {
- cmd = cmd_next;
- continue;
- }
- spin_unlock_bh(&conn->cmd_lock);
+ spin_unlock_bh(&conn->cmd_lock);
iscsi_increment_maxcmdsn(cmd, sess);
/*
* Special case for transport_get_lun_for_cmd() failing
--
1.5.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
