Commit bf682942 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI fixes from James Bottomley:
 "Three small and pretty obvious fixes, all in drivers"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: mpt3sas: Fix return value check of dma_get_required_mask()
  scsi: qla2xxx: Fix memory leak in __qlt_24xx_handle_abts()
  scsi: qedf: Fix a UAF bug in __qedf_probe()
parents 3c0f396a e0e0747d

drivers/scsi/mpt3sas/mpt3sas_base.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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) {