Commit b765a32a 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:
 "Three minor fixes, all in drivers"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: scsi_debug: Remove superfluous close zone in resp_open_zone()
  scsi: libcxgbi: Fix a use after free in cxgbi_conn_xmit_pdu()
  scsi: qedf: Fix null ptr reference in qedf_stag_change_work
parents b51594df 75d46c6d

drivers/scsi/cxgbi/libcxgbi.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE