Skip to content

Commit bf68294

Browse files
committed
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()
2 parents 3c0f396 + e0e0747 commit bf68294

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

drivers/scsi/mpt3sas/mpt3sas_base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2993,7 +2993,7 @@ _base_config_dma_addressing(struct MPT3SAS_ADAPTER *ioc, struct pci_dev *pdev)
29932993

29942994
if (ioc->is_mcpu_endpoint ||
29952995
sizeof(dma_addr_t) == 4 || ioc->use_32bit_dma ||
2996-
dma_get_required_mask(&pdev->dev) <= 32)
2996+
dma_get_required_mask(&pdev->dev) <= DMA_BIT_MASK(32))
29972997
ioc->dma_mask = 32;
29982998
/* Set 63 bit DMA mask for all SAS3 and SAS35 controllers */
29992999
else if (ioc->hba_mpi_version_belonged > MPI2_VERSION)

drivers/scsi/qedf/qedf_main.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3686,11 +3686,6 @@ static int __qedf_probe(struct pci_dev *pdev, int mode)
36863686
err1:
36873687
scsi_host_put(lport->host);
36883688
err0:
3689-
if (qedf) {
3690-
QEDF_INFO(&qedf->dbg_ctx, QEDF_LOG_DISC, "Probe done.\n");
3691-
3692-
clear_bit(QEDF_PROBING, &qedf->flags);
3693-
}
36943689
return rc;
36953690
}
36963691

drivers/scsi/qla2xxx/qla_target.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2151,8 +2151,10 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
21512151

21522152
abort_cmd = ha->tgt.tgt_ops->find_cmd_by_tag(sess,
21532153
le32_to_cpu(abts->exchange_addr_to_abort));
2154-
if (!abort_cmd)
2154+
if (!abort_cmd) {
2155+
mempool_free(mcmd, qla_tgt_mgmt_cmd_mempool);
21552156
return -EIO;
2157+
}
21562158
mcmd->unpacked_lun = abort_cmd->se_cmd.orig_fe_lun;
21572159

21582160
if (abort_cmd->qpair) {

0 commit comments

Comments
 (0)