releases/4.9.28/scsi-qla2xxx-fix-crash-in-qla2xxx_eh_abort-on-bad-ptr.patch

   1 From 5f7c2beef819d9ea2d1b814edf6f5981420e9cf8 Mon Sep 17 00:00:00 2001
   2 From: Bill Kuzeja <William.Kuzeja@stratus.com>
   3 Date: Tue, 14 Mar 2017 13:28:44 -0400
   4 Subject: scsi: qla2xxx: Fix crash in qla2xxx_eh_abort on bad ptr
   5
   6 From: Bill Kuzeja <William.Kuzeja@stratus.com>
   7
   8 commit 5f7c2beef819d9ea2d1b814edf6f5981420e9cf8 upstream.
   9
  10 After a Qlogic card breaks when initializing (test case), the system can
  11 crash in qla2xxx_eh_abort if processing anything but a scsi command type
  12 srb.
  13
  14 Fixes: 1535aa75a3d8 ("scsi: qla2xxx: fix invalid DMA access after command aborts in PCI device remove")
  15 Signed-off-by: Bill Kuzeja <william.kuzeja@stratus.com>
  16 Acked-By: Himanshu Madhani <himanshu.madhani@cavium.com>
  17 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19
  20 ---
  21  drivers/scsi/qla2xxx/qla_os.c |    3 ++-
  22  1 file changed, 2 insertions(+), 1 deletion(-)
  23
  24 --- a/drivers/scsi/qla2xxx/qla_os.c
  25 +++ b/drivers/scsi/qla2xxx/qla_os.c
  26 @@ -1464,7 +1464,8 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *
  27                                 /* Don't abort commands in adapter during EEH
  28                                  * recovery as it's not accessible/responding.
  29                                  */
  30 -                               if (GET_CMD_SP(sp) && !ha->flags.eeh_busy) {
  31 +                               if (GET_CMD_SP(sp) && !ha->flags.eeh_busy &&
  32 +                                   (sp->type == SRB_SCSI_CMD)) {
  33                                         /* Get a reference to the sp and drop the lock.
  34                                          * The reference ensures this sp->done() call
  35                                          * - and not the call in qla2xxx_eh_abort() -