Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
"Five fairly minor fixes and spelling updates, all in drivers. Even
though the ufs fix is in tracing, it's a potentially exploitable use
beyond end of array bug"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: csiostor: Add module softdep on cxgb4
scsi: qla2xxx: Fix excessive messages during device logout
scsi: virtio_scsi: Fix spelling mistake "Unsupport" -> "Unsupported"
scsi: ses: Fix unsigned comparison with less than zero
scsi: ufs: Fix illegal offset in UPIU event trace

+7 -7
+1
drivers/scsi/csiostor/csio_init.c
··· 1254 MODULE_VERSION(CSIO_DRV_VERSION); 1255 MODULE_FIRMWARE(FW_FNAME_T5); 1256 MODULE_FIRMWARE(FW_FNAME_T6);
··· 1254 MODULE_VERSION(CSIO_DRV_VERSION); 1255 MODULE_FIRMWARE(FW_FNAME_T5); 1256 MODULE_FIRMWARE(FW_FNAME_T6); 1257 + MODULE_SOFTDEP("pre: cxgb4");
+2 -2
drivers/scsi/qla2xxx/qla_isr.c
··· 2634 } 2635 2636 if (unlikely(logit)) 2637 - ql_log(ql_log_warn, fcport->vha, 0x5060, 2638 "NVME-%s ERR Handling - hdl=%x status(%x) tr_len:%x resid=%x ox_id=%x\n", 2639 sp->name, sp->handle, comp_status, 2640 fd->transferred_length, le32_to_cpu(sts->residual_len), ··· 3491 3492 out: 3493 if (logit) 3494 - ql_log(ql_log_warn, fcport->vha, 0x3022, 3495 "FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%llu portid=%02x%02x%02x oxid=0x%x cdb=%10phN len=0x%x rsp_info=0x%x resid=0x%x fw_resid=0x%x sp=%p cp=%p.\n", 3496 comp_status, scsi_status, res, vha->host_no, 3497 cp->device->id, cp->device->lun, fcport->d_id.b.domain,
··· 2634 } 2635 2636 if (unlikely(logit)) 2637 + ql_log(ql_dbg_io, fcport->vha, 0x5060, 2638 "NVME-%s ERR Handling - hdl=%x status(%x) tr_len:%x resid=%x ox_id=%x\n", 2639 sp->name, sp->handle, comp_status, 2640 fd->transferred_length, le32_to_cpu(sts->residual_len), ··· 3491 3492 out: 3493 if (logit) 3494 + ql_log(ql_dbg_io, fcport->vha, 0x3022, 3495 "FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%llu portid=%02x%02x%02x oxid=0x%x cdb=%10phN len=0x%x rsp_info=0x%x resid=0x%x fw_resid=0x%x sp=%p cp=%p.\n", 3496 comp_status, scsi_status, res, vha->host_no, 3497 cp->device->id, cp->device->lun, fcport->d_id.b.domain,
+1 -1
drivers/scsi/ses.c
··· 118 static int ses_send_diag(struct scsi_device *sdev, int page_code, 119 void *buf, int bufflen) 120 { 121 - u32 result; 122 123 unsigned char cmd[] = { 124 SEND_DIAGNOSTIC,
··· 118 static int ses_send_diag(struct scsi_device *sdev, int page_code, 119 void *buf, int bufflen) 120 { 121 + int result; 122 123 unsigned char cmd[] = { 124 SEND_DIAGNOSTIC,
+1 -2
drivers/scsi/ufs/ufshcd.c
··· 318 static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag, 319 enum ufs_trace_str_t str_t) 320 { 321 - int off = (int)tag - hba->nutrs; 322 - struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[off]; 323 324 if (!trace_ufshcd_upiu_enabled()) 325 return;
··· 318 static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag, 319 enum ufs_trace_str_t str_t) 320 { 321 + struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[tag]; 322 323 if (!trace_ufshcd_upiu_enabled()) 324 return;
+2 -2
drivers/scsi/virtio_scsi.c
··· 300 } 301 break; 302 default: 303 - pr_info("Unsupport virtio scsi event reason %x\n", event->reason); 304 } 305 } 306 ··· 392 virtscsi_handle_param_change(vscsi, event); 393 break; 394 default: 395 - pr_err("Unsupport virtio scsi event %x\n", event->event); 396 } 397 virtscsi_kick_event(vscsi, event_node); 398 }
··· 300 } 301 break; 302 default: 303 + pr_info("Unsupported virtio scsi event reason %x\n", event->reason); 304 } 305 } 306 ··· 392 virtscsi_handle_param_change(vscsi, event); 393 break; 394 default: 395 + pr_err("Unsupported virtio scsi event %x\n", event->event); 396 } 397 virtscsi_kick_event(vscsi, event_node); 398 }