Commit af97713d 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:
 "Eight fixes, all in drivers, all fairly minor either being fixes in
  error legs, memory leaks on teardown, context errors or semantic
  problems"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: mpt3sas: Do not use GFP_KERNEL in atomic context
  scsi: ufs: ufs-mediatek: Correct operator & -> &&
  scsi: sd_zbc: Update write pointer offset cache
  scsi: lpfc: Fix some error codes in debugfs
  scsi: qla2xxx: Fix broken #endif placement
  scsi: st: Fix a use after free in st_open()
  scsi: myrs: Fix a double free in myrs_cleanup()
  scsi: ibmvfc: Free channel_setup_buf during device tear down
parents 1c273e10 a50bd646

drivers/scsi/ibmvscsi/ibmvfc.c

+2 −0
Original line number Diff line number Diff line
@@ -5784,6 +5784,8 @@ static void ibmvfc_free_mem(struct ibmvfc_host *vhost) 
			  vhost->disc_buf_dma);

	dma_free_coherent(vhost->dev, sizeof(*vhost->login_buf),

			  vhost->login_buf, vhost->login_buf_dma);

	dma_free_coherent(vhost->dev, sizeof(*vhost->channel_setup_buf),

			  vhost->channel_setup_buf, vhost->channel_setup_dma);

	dma_pool_destroy(vhost->sg_pool);

	ibmvfc_free_queue(vhost, async_q);

	LEAVE;

drivers/scsi/lpfc/lpfc_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -2421,7 +2421,7 @@ lpfc_debugfs_dif_err_write(struct file *file, const char __user *buf, 
	memset(dstbuf, 0, 33);

	size = (nbytes < 32) ? nbytes : 32;

	if (copy_from_user(dstbuf, buf, size))

		return 0;

		return -EFAULT;



	if (dent == phba->debug_InjErrLBA) {

		if ((dstbuf[0] == 'o') && (dstbuf[1] == 'f') &&
@@ -2430,7 +2430,7 @@ lpfc_debugfs_dif_err_write(struct file *file, const char __user *buf, 
	}



	if ((tmp == 0) && (kstrtoull(dstbuf, 0, &tmp)))

		return 0;

		return -EINVAL;



	if (dent == phba->debug_writeGuard)

		phba->lpfc_injerr_wgrd_cnt = (uint32_t)tmp;

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ mpt3sas_get_port_by_id(struct MPT3SAS_ADAPTER *ioc, 
	 * And add this object to port_table_list.

	 */

	if (!ioc->multipath_on_hba) {

		port = kzalloc(sizeof(struct hba_port), GFP_KERNEL);

		port = kzalloc(sizeof(struct hba_port), GFP_ATOMIC);

		if (!port)

			return NULL;

drivers/scsi/myrs.c

+1 −1
Original line number Diff line number Diff line
@@ -2273,12 +2273,12 @@ static void myrs_cleanup(struct myrs_hba *cs) 
	if (cs->mmio_base) {

		cs->disable_intr(cs);

		iounmap(cs->mmio_base);

		cs->mmio_base = NULL;

	}

	if (cs->irq)

		free_irq(cs->irq, cs);

	if (cs->io_addr)

		release_region(cs->io_addr, 0x80);

	iounmap(cs->mmio_base);

	pci_set_drvdata(pdev, NULL);

	pci_disable_device(pdev);

	scsi_host_put(cs->host);

drivers/scsi/qla2xxx/qla_target.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ 
	(min(1270, ((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD_24XX + \

		QLA_TGT_DATASEGS_PER_CONT_24XX*((ql) - 1)) : 0))

#endif

#endif



#define GET_TARGET_ID(ha, iocb) ((HAS_EXTENDED_IDS(ha))			\

			 ? le16_to_cpu((iocb)->u.isp2x.target.extended)	\
@@ -244,6 +243,7 @@ struct ctio_to_2xxx { 
#ifndef CTIO_RET_TYPE

#define CTIO_RET_TYPE	0x17		/* CTIO return entry */

#define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */

#endif



struct fcp_hdr {

	uint8_t  r_ctl;