scsi: qla2xxx: Fix recursion while sending terminate exchange

himanshu.madhani@cavium.com · martinkpetersen · commit 3efc31f76dd7 · 2018-01-17T01:34:24.000-05:00
During error test case where switch port status is toggled from enable to disable, following stack trace is seen which indicates recursion trying to send terminate exchange. This regression was introduced by commit 82de802 ("scsi: qla2xxx: Preparation for Target MQ.") BUG: stack guard page was hit at ffffb96488383ff8 (stack is ffffb96488384000..ffffb96488387fff) BUG: stack guard page was hit at ffffb964886c3ff8 (stack is ffffb964886c4000..ffffb964886c7fff) kernel stack overflow (double-fault): 0000 [#1] SMP qlt_term_ctio_exchange+0x9c/0xb0 [qla2xxx] qlt_term_ctio_exchange+0x9c/0xb0 [qla2xxx] qlt_term_ctio_exchange+0x9c/0xb0 [qla2xxx] qlt_term_ctio_exchange+0x9c/0xb0 [qla2xxx] qlt_term_ctio_exchange+0x9c/0xb0 [qla2xxx] Fixes: 82de802 ("scsi: qla2xxx: Preparation for Target MQ.") Cc: <stable@vger.kernel.org> #4.10 Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
@@ -3756,7 +3756,7 @@ static int qlt_term_ctio_exchange(struct qla_qpair *qpair, void *ctio,
 		term = 1;
 
 	if (term)
-		qlt_term_ctio_exchange(qpair, ctio, cmd, status);
+		qlt_send_term_exchange(qpair, cmd, &cmd->atio, 1, 0);
 
 	return term;
 }

Original file line number	Diff line number	Diff line change
`@@ -3756,7 +3756,7 @@ static int qlt_term_ctio_exchange(struct qla_qpair qpair, void ctio,`
`3756`	`3756`	`term = 1;`
`3757`	`3757`
`3758`	`3758`	`if (term)`
`3759`		`- qlt_term_ctio_exchange(qpair, ctio, cmd, status);`
	`3759`	`+ qlt_send_term_exchange(qpair, cmd, &cmd->atio, 1, 0);`
`3760`	`3760`
`3761`	`3761`	`return term;`
`3762`	`3762`	`}`