SCSI fixes for 5.8-rc3
Subsystems (2)
James Bottomley
maintainerThree minor fixes, all in drivers.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Dan Carpenter (1):
scsi: libcxgbi: Fix a use after free in cxgbi_conn_xmit_pdu()
Niklas Cassel (1):
scsi: scsi_debug: Remove superfluous close zone in resp_open_zone()
Ye Bin (1):
scsi: qedf: Fix null ptr reference in qedf_stag_change_work
With the diffstat:
drivers/scsi/cxgbi/libcxgbi.c | 2 +- drivers/scsi/qedf/qedf_main.c | 2 +- drivers/scsi/scsi_debug.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-)
And full diff below.
James
---
drivers/scsi/cxgbi/libcxgbi.c +1 -1
@@ -2457,10 +2457,10 @@ int cxgbi_conn_xmit_pdu(struct iscsi_task *task)return err; } -__kfree_skb (skb);log_debug (1 <<CXGBI_DBG_ISCSI |1 <<CXGBI_DBG_PDU_TX ,"itt 0x%x, skb 0x%p, len %u/%u, xmit err %d.\n" , task->itt, skb, skb->len, skb->data_len, err); +__kfree_skb (skb);iscsi_conn_printk (KERN_ERR , task->conn,"xmit err %d.\n" , err);iscsi_conn_failure (task->conn,ISCSI_ERR_XMIT_FAILED );return err;
drivers/scsi/qedf/qedf_main.c +1 -1
@@ -3863,7 +3863,7 @@ void qedf_stag_change_work(struct work_struct *work) container_of(work, struct qedf_ctx, stag_work.work);if (!qedf) { -QEDF_ERR (&qedf->dbg_ctx,"qedf is NULL" ); +QEDF_ERR (NULL ,"qedf is NULL" );return ; }QEDF_ERR (&qedf->dbg_ctx,"Performing software context reset.\n" );
drivers/scsi/scsi_debug.c +0 -2
@@ -4482,8 +4482,6 @@ static int resp_open_zone(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) goto fini; } -if (zc ==ZC2_IMPLICIT_OPEN ) -zbc_close_zone (devip, zsp);zbc_open_zone (devip, zsp, true); fini:write_unlock (macc_lckp);
The pull request you sent on Tue, 01 Sep 2020 14:04:56 -0700:
The pull request you sent on Tue, 01 Sep 2020 14:04:56 -0700:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b765a32a2e9170702467747e290614be072c4f76
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html