diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2017-10-27 23:52:56 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2017-11-07 22:51:24 -0500 |
commit | 3fc9fb13a4b2576aeab86c62fd64eb29ab68659c (patch) | |
tree | 851eb117f2a8a2b7cca58bc460dabcae09b0a598 | |
parent | ae072726f6109bb1c94841d6fb3a82dde298ea85 (diff) |
iscsi-target: Fix non-immediate TMR reference leak
This patch fixes a se_cmd->cmd_kref reference leak that can
occur when a non immediate TMR is proceeded our of command
sequence number order, and CMDSN_LOWER_THAN_EXP is returned
by iscsit_sequence_cmd().
To address this bug, call target_put_sess_cmd() during this
special case following what iscsit_process_scsi_cmd() does
upon CMDSN_LOWER_THAN_EXP.
Cc: Mike Christie <mchristi@redhat.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: stable@vger.kernel.org # 3.10+
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r-- | drivers/target/iscsi/iscsi_target.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 048d4227327c..3b7bb589d301 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c | |||
@@ -2094,12 +2094,14 @@ attach: | |||
2094 | 2094 | ||
2095 | if (!(hdr->opcode & ISCSI_OP_IMMEDIATE)) { | 2095 | if (!(hdr->opcode & ISCSI_OP_IMMEDIATE)) { |
2096 | int cmdsn_ret = iscsit_sequence_cmd(conn, cmd, buf, hdr->cmdsn); | 2096 | int cmdsn_ret = iscsit_sequence_cmd(conn, cmd, buf, hdr->cmdsn); |
2097 | if (cmdsn_ret == CMDSN_HIGHER_THAN_EXP) | 2097 | if (cmdsn_ret == CMDSN_HIGHER_THAN_EXP) { |
2098 | out_of_order_cmdsn = 1; | 2098 | out_of_order_cmdsn = 1; |
2099 | else if (cmdsn_ret == CMDSN_LOWER_THAN_EXP) | 2099 | } else if (cmdsn_ret == CMDSN_LOWER_THAN_EXP) { |
2100 | target_put_sess_cmd(&cmd->se_cmd); | ||
2100 | return 0; | 2101 | return 0; |
2101 | else if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER) | 2102 | } else if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER) { |
2102 | return -1; | 2103 | return -1; |
2104 | } | ||
2103 | } | 2105 | } |
2104 | iscsit_ack_from_expstatsn(conn, be32_to_cpu(hdr->exp_statsn)); | 2106 | iscsit_ack_from_expstatsn(conn, be32_to_cpu(hdr->exp_statsn)); |
2105 | 2107 | ||