SCSI fixes for 6.0-rc6
Subsystems (4)
James Bottomley
maintainerThree small and pretty obvious fixes, all in drivers.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Letu Ren (1):
scsi: qedf: Fix a UAF bug in __qedf_probe()
Rafael Mendonca (1):
scsi: qla2xxx: Fix memory leak in __qlt_24xx_handle_abts()
Sreekanth Reddy (1):
scsi: mpt3sas: Fix return value check of dma_get_required_mask()
And the diffstat:
drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- drivers/scsi/qedf/qedf_main.c | 5 ----- drivers/scsi/qla2xxx/qla_target.c | 4 +++- 3 files changed, 4 insertions(+), 7 deletions(-)
With full diff below.
James
---
drivers/scsi/mpt3sas/mpt3sas_base.c +1 -1
@@ -2993,7 +2993,7 @@ _base_config_dma_addressing(struct MPT3SAS_ADAPTER *ioc, struct pci_dev *pdev)if (ioc->is_mcpu_endpoint ||sizeof (dma_addr_t) ==4 || ioc->use_32bit_dma || -dma_get_required_mask (&pdev->dev) <=32 ) +dma_get_required_mask (&pdev->dev) <=DMA_BIT_MASK (32 )) ioc->dma_mask =32 ;/* Set 63 bit DMA mask for all SAS3 and SAS35 controllers */ else if (ioc->hba_mpi_version_belonged >MPI2_VERSION )
drivers/scsi/qedf/qedf_main.c +0 -5
@@ -3686,11 +3686,6 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) err1:scsi_host_put (lport->host); err0: -if (qedf) { -QEDF_INFO (&qedf->dbg_ctx,QEDF_LOG_DISC ,"Probe done.\n" ); - -clear_bit (QEDF_PROBING , &qedf->flags); - }return rc; }
drivers/scsi/qla2xxx/qla_target.c +3 -1
@@ -2151,8 +2151,10 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, abort_cmd = ha->tgt.tgt_ops->find_cmd_by_tag (sess,le32_to_cpu (abts->exchange_addr_to_abort)); -if (!abort_cmd) +if (!abort_cmd) { +mempool_free (mcmd, qla_tgt_mgmt_cmd_mempool);return -EIO ; + } mcmd->unpacked_lun = abort_cmd->se_cmd.orig_fe_lun;if (abort_cmd->qpair) {
The pull request you sent on Thu, 22 Sep 2022 16:57:06 -0400:
The pull request you sent on Thu, 22 Sep 2022 16:57:06 -0400:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/bf682942cd26ce9cd5e87f73ae099b383041e782
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html