mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
SCSI fixes on 20211002
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. Signed-off-by: James E.J. Bottomley <jejb@linux.ibm.com> -----BEGIN PGP SIGNATURE----- iJwEABMIAEQWIQTnYEDbdso9F2cI+arnQslM7pishQUCYVithCYcamFtZXMuYm90 dG9tbGV5QGhhbnNlbnBhcnRuZXJzaGlwLmNvbQAKCRDnQslM7pisheg2AQCIEeRe aLd9ZK8brXzB9b1EApCPgpWKGhF217P/TWPuTgEAoZRJZWJ3jD/yzCke/IyF62+x LuYiCR2yTMhsTCIGodM= =6v3Q -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
9904468fb0
5 changed files with 7 additions and 7 deletions
|
@ -1254,3 +1254,4 @@ MODULE_DEVICE_TABLE(pci, csio_pci_tbl);
|
||||||
MODULE_VERSION(CSIO_DRV_VERSION);
|
MODULE_VERSION(CSIO_DRV_VERSION);
|
||||||
MODULE_FIRMWARE(FW_FNAME_T5);
|
MODULE_FIRMWARE(FW_FNAME_T5);
|
||||||
MODULE_FIRMWARE(FW_FNAME_T6);
|
MODULE_FIRMWARE(FW_FNAME_T6);
|
||||||
|
MODULE_SOFTDEP("pre: cxgb4");
|
||||||
|
|
|
@ -2634,7 +2634,7 @@ static void qla24xx_nvme_iocb_entry(scsi_qla_host_t *vha, struct req_que *req,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unlikely(logit))
|
if (unlikely(logit))
|
||||||
ql_log(ql_log_warn, fcport->vha, 0x5060,
|
ql_log(ql_dbg_io, fcport->vha, 0x5060,
|
||||||
"NVME-%s ERR Handling - hdl=%x status(%x) tr_len:%x resid=%x ox_id=%x\n",
|
"NVME-%s ERR Handling - hdl=%x status(%x) tr_len:%x resid=%x ox_id=%x\n",
|
||||||
sp->name, sp->handle, comp_status,
|
sp->name, sp->handle, comp_status,
|
||||||
fd->transferred_length, le32_to_cpu(sts->residual_len),
|
fd->transferred_length, le32_to_cpu(sts->residual_len),
|
||||||
|
@ -3491,7 +3491,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
|
||||||
|
|
||||||
out:
|
out:
|
||||||
if (logit)
|
if (logit)
|
||||||
ql_log(ql_log_warn, fcport->vha, 0x3022,
|
ql_log(ql_dbg_io, fcport->vha, 0x3022,
|
||||||
"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",
|
"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",
|
||||||
comp_status, scsi_status, res, vha->host_no,
|
comp_status, scsi_status, res, vha->host_no,
|
||||||
cp->device->id, cp->device->lun, fcport->d_id.b.domain,
|
cp->device->id, cp->device->lun, fcport->d_id.b.domain,
|
||||||
|
|
|
@ -118,7 +118,7 @@ static int ses_recv_diag(struct scsi_device *sdev, int page_code,
|
||||||
static int ses_send_diag(struct scsi_device *sdev, int page_code,
|
static int ses_send_diag(struct scsi_device *sdev, int page_code,
|
||||||
void *buf, int bufflen)
|
void *buf, int bufflen)
|
||||||
{
|
{
|
||||||
u32 result;
|
int result;
|
||||||
|
|
||||||
unsigned char cmd[] = {
|
unsigned char cmd[] = {
|
||||||
SEND_DIAGNOSTIC,
|
SEND_DIAGNOSTIC,
|
||||||
|
|
|
@ -318,8 +318,7 @@ static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba,
|
||||||
static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag,
|
static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag,
|
||||||
enum ufs_trace_str_t str_t)
|
enum ufs_trace_str_t str_t)
|
||||||
{
|
{
|
||||||
int off = (int)tag - hba->nutrs;
|
struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[tag];
|
||||||
struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[off];
|
|
||||||
|
|
||||||
if (!trace_ufshcd_upiu_enabled())
|
if (!trace_ufshcd_upiu_enabled())
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -300,7 +300,7 @@ static void virtscsi_handle_transport_reset(struct virtio_scsi *vscsi,
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
pr_info("Unsupport virtio scsi event reason %x\n", event->reason);
|
pr_info("Unsupported virtio scsi event reason %x\n", event->reason);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -392,7 +392,7 @@ static void virtscsi_handle_event(struct work_struct *work)
|
||||||
virtscsi_handle_param_change(vscsi, event);
|
virtscsi_handle_param_change(vscsi, event);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
pr_err("Unsupport virtio scsi event %x\n", event->event);
|
pr_err("Unsupported virtio scsi event %x\n", event->event);
|
||||||
}
|
}
|
||||||
virtscsi_kick_event(vscsi, event_node);
|
virtscsi_kick_event(vscsi, event_node);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue