ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2021-03-20 10:57:10 -07:00
parent 1c273e10bc a50bd64616
commit af97713dff
8 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/ibmvscsi/ibmvfc.c
View File

@@ -5784,6 +5784,8 @@ static void ibmvfc_free_mem(struct ibmvfc_host *vhost)
vhost->disc_buf_dma); vhost->disc_buf_dma);
dma_free_coherent(vhost->dev, sizeof(*vhost->login_buf), dma_free_coherent(vhost->dev, sizeof(*vhost->login_buf),
vhost->login_buf, vhost->login_buf_dma); 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); dma_pool_destroy(vhost->sg_pool);
ibmvfc_free_queue(vhost, async_q); ibmvfc_free_queue(vhost, async_q);
LEAVE; LEAVE;

4
drivers/scsi/lpfc/lpfc_debugfs.c
View File

@@ -2421,7 +2421,7 @@ lpfc_debugfs_dif_err_write(struct file *file, const char __user *buf,
memset(dstbuf, 0, 33); memset(dstbuf, 0, 33);
size = (nbytes < 32) ? nbytes : 32; size = (nbytes < 32) ? nbytes : 32;
if (copy_from_user(dstbuf, buf, size)) if (copy_from_user(dstbuf, buf, size))
return 0; return -EFAULT;
if (dent == phba->debug_InjErrLBA) { if (dent == phba->debug_InjErrLBA) {
if ((dstbuf[0] == 'o') && (dstbuf[1] == 'f') && 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))) if ((tmp == 0) && (kstrtoull(dstbuf, 0, &tmp)))
return 0; return -EINVAL;
if (dent == phba->debug_writeGuard) if (dent == phba->debug_writeGuard)
phba->lpfc_injerr_wgrd_cnt = (uint32_t)tmp; phba->lpfc_injerr_wgrd_cnt = (uint32_t)tmp;

2
drivers/scsi/mpt3sas/mpt3sas_scsih.c
View File

@@ -413,7 +413,7 @@ mpt3sas_get_port_by_id(struct MPT3SAS_ADAPTER *ioc,
* And add this object to port_table_list. * And add this object to port_table_list.
*/ */
if (!ioc->multipath_on_hba) { if (!ioc->multipath_on_hba) {
port = kzalloc(sizeof(struct hba_port), GFP_KERNEL); port = kzalloc(sizeof(struct hba_port), GFP_ATOMIC);
if (!port) if (!port)
return NULL; return NULL;

2
drivers/scsi/myrs.c
View File

@@ -2273,12 +2273,12 @@ static void myrs_cleanup(struct myrs_hba *cs)
if (cs->mmio_base) { if (cs->mmio_base) {
cs->disable_intr(cs); cs->disable_intr(cs);
iounmap(cs->mmio_base); iounmap(cs->mmio_base);
cs->mmio_base = NULL;
} }
if (cs->irq) if (cs->irq)
free_irq(cs->irq, cs); free_irq(cs->irq, cs);
if (cs->io_addr) if (cs->io_addr)
release_region(cs->io_addr, 0x80); release_region(cs->io_addr, 0x80);
iounmap(cs->mmio_base);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
pci_disable_device(pdev); pci_disable_device(pdev);
scsi_host_put(cs->host); scsi_host_put(cs->host);

2
drivers/scsi/qla2xxx/qla_target.h
View File

@@ -116,7 +116,6 @@
(min(1270, ((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD_24XX + \ (min(1270, ((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD_24XX + \
QLA_TGT_DATASEGS_PER_CONT_24XX*((ql) - 1)) : 0)) QLA_TGT_DATASEGS_PER_CONT_24XX*((ql) - 1)) : 0))
#endif #endif
#endif
#define GET_TARGET_ID(ha, iocb) ((HAS_EXTENDED_IDS(ha)) \ #define GET_TARGET_ID(ha, iocb) ((HAS_EXTENDED_IDS(ha)) \
? le16_to_cpu((iocb)->u.isp2x.target.extended) \ ? le16_to_cpu((iocb)->u.isp2x.target.extended) \
@@ -244,6 +243,7 @@ struct ctio_to_2xxx {
#ifndef CTIO_RET_TYPE #ifndef CTIO_RET_TYPE
#define CTIO_RET_TYPE 0x17 /* CTIO return entry */ #define CTIO_RET_TYPE 0x17 /* CTIO return entry */
#define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */ #define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */
#endif
struct fcp_hdr { struct fcp_hdr {
uint8_t r_ctl; uint8_t r_ctl;

19
drivers/scsi/sd_zbc.c
View File

@@ -280,27 +280,28 @@ static int sd_zbc_update_wp_offset_cb(struct blk_zone *zone, unsigned int idx,
static void sd_zbc_update_wp_offset_workfn(struct work_struct *work) static void sd_zbc_update_wp_offset_workfn(struct work_struct *work)
{ {
struct scsi_disk *sdkp; struct scsi_disk *sdkp;
unsigned long flags;
unsigned int zno; unsigned int zno;
int ret; int ret;
sdkp = container_of(work, struct scsi_disk, zone_wp_offset_work); sdkp = container_of(work, struct scsi_disk, zone_wp_offset_work);
spin_lock_bh(&sdkp->zones_wp_offset_lock); spin_lock_irqsave(&sdkp->zones_wp_offset_lock, flags);
for (zno = 0; zno < sdkp->nr_zones; zno++) { for (zno = 0; zno < sdkp->nr_zones; zno++) {
if (sdkp->zones_wp_offset[zno] != SD_ZBC_UPDATING_WP_OFST) if (sdkp->zones_wp_offset[zno] != SD_ZBC_UPDATING_WP_OFST)
continue; continue;
spin_unlock_bh(&sdkp->zones_wp_offset_lock); spin_unlock_irqrestore(&sdkp->zones_wp_offset_lock, flags);
ret = sd_zbc_do_report_zones(sdkp, sdkp->zone_wp_update_buf, ret = sd_zbc_do_report_zones(sdkp, sdkp->zone_wp_update_buf,
SD_BUF_SIZE, SD_BUF_SIZE,
zno * sdkp->zone_blocks, true); zno * sdkp->zone_blocks, true);
spin_lock_bh(&sdkp->zones_wp_offset_lock); spin_lock_irqsave(&sdkp->zones_wp_offset_lock, flags);
if (!ret) if (!ret)
sd_zbc_parse_report(sdkp, sdkp->zone_wp_update_buf + 64, sd_zbc_parse_report(sdkp, sdkp->zone_wp_update_buf + 64,
zno, sd_zbc_update_wp_offset_cb, zno, sd_zbc_update_wp_offset_cb,
sdkp); sdkp);
} }
spin_unlock_bh(&sdkp->zones_wp_offset_lock); spin_unlock_irqrestore(&sdkp->zones_wp_offset_lock, flags);
scsi_device_put(sdkp->device); scsi_device_put(sdkp->device);
} }
@@ -324,6 +325,7 @@ blk_status_t sd_zbc_prepare_zone_append(struct scsi_cmnd *cmd, sector_t *lba,
struct request *rq = cmd->request; struct request *rq = cmd->request;
struct scsi_disk *sdkp = scsi_disk(rq->rq_disk); struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
unsigned int wp_offset, zno = blk_rq_zone_no(rq); unsigned int wp_offset, zno = blk_rq_zone_no(rq);
unsigned long flags;
blk_status_t ret; blk_status_t ret;
ret = sd_zbc_cmnd_checks(cmd); ret = sd_zbc_cmnd_checks(cmd);
@@ -337,7 +339,7 @@ blk_status_t sd_zbc_prepare_zone_append(struct scsi_cmnd *cmd, sector_t *lba,
if (!blk_req_zone_write_trylock(rq)) if (!blk_req_zone_write_trylock(rq))
return BLK_STS_ZONE_RESOURCE; return BLK_STS_ZONE_RESOURCE;
spin_lock_bh(&sdkp->zones_wp_offset_lock); spin_lock_irqsave(&sdkp->zones_wp_offset_lock, flags);
wp_offset = sdkp->zones_wp_offset[zno]; wp_offset = sdkp->zones_wp_offset[zno];
switch (wp_offset) { switch (wp_offset) {
case SD_ZBC_INVALID_WP_OFST: case SD_ZBC_INVALID_WP_OFST:
@@ -366,7 +368,7 @@ blk_status_t sd_zbc_prepare_zone_append(struct scsi_cmnd *cmd, sector_t *lba,
*lba += wp_offset; *lba += wp_offset;
} }
spin_unlock_bh(&sdkp->zones_wp_offset_lock); spin_unlock_irqrestore(&sdkp->zones_wp_offset_lock, flags);
if (ret) if (ret)
blk_req_zone_write_unlock(rq); blk_req_zone_write_unlock(rq);
return ret; return ret;
@@ -445,6 +447,7 @@ static unsigned int sd_zbc_zone_wp_update(struct scsi_cmnd *cmd,
struct scsi_disk *sdkp = scsi_disk(rq->rq_disk); struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
unsigned int zno = blk_rq_zone_no(rq); unsigned int zno = blk_rq_zone_no(rq);
enum req_opf op = req_op(rq); enum req_opf op = req_op(rq);
unsigned long flags;
/* /*
* If we got an error for a command that needs updating the write * If we got an error for a command that needs updating the write
@@ -452,7 +455,7 @@ static unsigned int sd_zbc_zone_wp_update(struct scsi_cmnd *cmd,
* invalid to force an update from disk the next time a zone append * invalid to force an update from disk the next time a zone append
* command is issued. * command is issued.
*/ */
spin_lock_bh(&sdkp->zones_wp_offset_lock); spin_lock_irqsave(&sdkp->zones_wp_offset_lock, flags);
if (result && op != REQ_OP_ZONE_RESET_ALL) { if (result && op != REQ_OP_ZONE_RESET_ALL) {
if (op == REQ_OP_ZONE_APPEND) { if (op == REQ_OP_ZONE_APPEND) {
@@ -496,7 +499,7 @@ static unsigned int sd_zbc_zone_wp_update(struct scsi_cmnd *cmd,
} }
unlock_wp_offset: unlock_wp_offset:
spin_unlock_bh(&sdkp->zones_wp_offset_lock); spin_unlock_irqrestore(&sdkp->zones_wp_offset_lock, flags);
return good_bytes; return good_bytes;
} }

2
drivers/scsi/st.c
View File

@@ -1269,8 +1269,8 @@ static int st_open(struct inode *inode, struct file *filp)
spin_lock(&st_use_lock); spin_lock(&st_use_lock);
if (STp->in_use) { if (STp->in_use) {
spin_unlock(&st_use_lock); spin_unlock(&st_use_lock);
scsi_tape_put(STp);
DEBC_printk(STp, "Device already in use.\n"); DEBC_printk(STp, "Device already in use.\n");
scsi_tape_put(STp);
return (-EBUSY); return (-EBUSY);
} }

2
drivers/scsi/ufs/ufs-mediatek.c
View File

@@ -911,7 +911,7 @@ static void ufs_mtk_vreg_set_lpm(struct ufs_hba *hba, bool lpm)
if (!hba->vreg_info.vccq2 || !hba->vreg_info.vcc) if (!hba->vreg_info.vccq2 || !hba->vreg_info.vcc)
return; return;
if (lpm & !hba->vreg_info.vcc->enabled) if (lpm && !hba->vreg_info.vcc->enabled)
regulator_set_mode(hba->vreg_info.vccq2->reg, regulator_set_mode(hba->vreg_info.vccq2->reg,
REGULATOR_MODE_IDLE); REGULATOR_MODE_IDLE);
else if (!lpm) else if (!lpm)