Commit 9f269348 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:
 "Small changes in drivers only, no core changes.

  The firewire one fixes a user controlled overflow (but I still can't
  see how it could be exploited)"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ufs: amd-versal2: Fix PHY initialization in HCE enable notify
  scsi: firewire: sbp-target: Fix overflow in sbp_make_tpg()
  scsi: be2iscsi: Fix a memory leak in beiscsi_boot_get_sinfo()
  scsi: qla2xxx: edif: Fix dma_free_coherent() size
parents c00a8791 0444568e

drivers/scsi/be2iscsi/be_mgmt.c

+1 −0
Original line number Diff line number Diff line
@@ -1025,6 +1025,7 @@ unsigned int beiscsi_boot_get_sinfo(struct beiscsi_hba *phba) 
					      &nonemb_cmd->dma,

					      GFP_KERNEL);

	if (!nonemb_cmd->va) {

		free_mcc_wrb(ctrl, tag);

		mutex_unlock(&ctrl->mbox_lock);

		return 0;

	}

drivers/scsi/qla2xxx/qla_os.c

+1 −1
Original line number Diff line number Diff line
@@ -4489,7 +4489,7 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len, 
fail_elsrej:

	dma_pool_destroy(ha->purex_dma_pool);

fail_flt:

	dma_free_coherent(&ha->pdev->dev, SFP_DEV_SIZE,

	dma_free_coherent(&ha->pdev->dev, sizeof(struct qla_flt_header) + FLT_REGIONS_SIZE,

	    ha->flt, ha->flt_dma);



fail_flt_buffer:

drivers/target/sbp/sbp_target.c

+2 −2
Original line number Diff line number Diff line
@@ -1960,12 +1960,12 @@ static struct se_portal_group *sbp_make_tpg(struct se_wwn *wwn, 
		container_of(wwn, struct sbp_tport, tport_wwn);



	struct sbp_tpg *tpg;

	unsigned long tpgt;

	u16 tpgt;

	int ret;



	if (strstr(name, "tpgt_") != name)

		return ERR_PTR(-EINVAL);

	if (kstrtoul(name + 5, 10, &tpgt) || tpgt > UINT_MAX)

	if (kstrtou16(name + 5, 10, &tpgt))

		return ERR_PTR(-EINVAL);



	if (tport->tpg) {

drivers/ufs/host/ufs-amd-versal2.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static int ufs_versal2_hce_enable_notify(struct ufs_hba *hba, 
{

	int ret = 0;



	if (status == PRE_CHANGE) {

	if (status == POST_CHANGE) {

		ret = ufs_versal2_phy_init(hba);

		if (ret)

			dev_err(hba->dev, "Phy init failed (%d)\n", ret);