Skip to content

Commit 05c5dd7

Browse files
Nicholas Bellingergregkh
authored andcommitted
iscsi-target: Fix TMR reference leak during session shutdown
commit efb2ea770bb3b0f40007530bc8b0c22f36e1c5eb upstream. This patch fixes a iscsi-target specific TMR reference leak during session shutdown, that could occur when a TMR was quiesced before the hand-off back to iscsi-target code via transport_cmd_check_stop_to_fabric(). The reference leak happens because iscsit_free_cmd() was incorrectly skipping the final target_put_sess_cmd() for TMRs when transport_generic_free_cmd() returned zero because the se_cmd->cmd_kref did not reach zero, due to the missing se_cmd assignment in original code. The result was iscsi_cmd and it's associated se_cmd memory would be freed once se_sess->sess_cmd_map where released, but the associated se_tmr_req was leaked and remained part of se_device->dev_tmr_list. This bug would manfiest itself as kernel paging request OOPsen in core_tmr_lun_reset(), when a left-over se_tmr_req attempted to dereference it's se_cmd pointer that had already been released during normal session shutdown. To address this bug, go ahead and treat ISCSI_OP_SCSI_CMD and ISCSI_OP_SCSI_TMFUNC the same when there is an extra se_cmd->cmd_kref to drop in iscsit_free_cmd(), and use op_scsi to signal __iscsit_free_cmd() when the former needs to clear any further iscsi related I/O state. Reported-by: Rob Millner <rlm@daterainc.com> Cc: Rob Millner <rlm@daterainc.com> Reported-by: Chu Yuan Lin <cyl@datera.io> Cc: Chu Yuan Lin <cyl@datera.io> Tested-by: Chu Yuan Lin <cyl@datera.io> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 074bcc1 commit 05c5dd7

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/target/iscsi/iscsi_target_util.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -731,21 +731,23 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown)
731731
{
732732
struct se_cmd *se_cmd = NULL;
733733
int rc;
734+
bool op_scsi = false;
734735
/*
735736
* Determine if a struct se_cmd is associated with
736737
* this struct iscsi_cmd.
737738
*/
738739
switch (cmd->iscsi_opcode) {
739740
case ISCSI_OP_SCSI_CMD:
740-
se_cmd = &cmd->se_cmd;
741-
__iscsit_free_cmd(cmd, true, shutdown);
741+
op_scsi = true;
742742
/*
743743
* Fallthrough
744744
*/
745745
case ISCSI_OP_SCSI_TMFUNC:
746-
rc = transport_generic_free_cmd(&cmd->se_cmd, shutdown);
747-
if (!rc && shutdown && se_cmd && se_cmd->se_sess) {
748-
__iscsit_free_cmd(cmd, true, shutdown);
746+
se_cmd = &cmd->se_cmd;
747+
__iscsit_free_cmd(cmd, op_scsi, shutdown);
748+
rc = transport_generic_free_cmd(se_cmd, shutdown);
749+
if (!rc && shutdown && se_cmd->se_sess) {
750+
__iscsit_free_cmd(cmd, op_scsi, shutdown);
749751
target_put_sess_cmd(se_cmd);
750752
}
751753
break;

0 commit comments

Comments
 (0)