Skip to content

Commit b765a32

Browse files
committed
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
2 parents b51594d + 75d46c6 commit b765a32

3 files changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/scsi/cxgbi/libcxgbi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2457,10 +2457,10 @@ int cxgbi_conn_xmit_pdu(struct iscsi_task *task)
24572457
return err;
24582458
}
24592459

2460-
__kfree_skb(skb);
24612460
log_debug(1 << CXGBI_DBG_ISCSI | 1 << CXGBI_DBG_PDU_TX,
24622461
"itt 0x%x, skb 0x%p, len %u/%u, xmit err %d.\n",
24632462
task->itt, skb, skb->len, skb->data_len, err);
2463+
__kfree_skb(skb);
24642464
iscsi_conn_printk(KERN_ERR, task->conn, "xmit err %d.\n", err);
24652465
iscsi_conn_failure(task->conn, ISCSI_ERR_XMIT_FAILED);
24662466
return err;

drivers/scsi/qedf/qedf_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3863,7 +3863,7 @@ void qedf_stag_change_work(struct work_struct *work)
38633863
container_of(work, struct qedf_ctx, stag_work.work);
38643864

38653865
if (!qedf) {
3866-
QEDF_ERR(&qedf->dbg_ctx, "qedf is NULL");
3866+
QEDF_ERR(NULL, "qedf is NULL");
38673867
return;
38683868
}
38693869
QEDF_ERR(&qedf->dbg_ctx, "Performing software context reset.\n");

drivers/scsi/scsi_debug.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4482,8 +4482,6 @@ static int resp_open_zone(struct scsi_cmnd *scp, struct sdebug_dev_info *devip)
44824482
goto fini;
44834483
}
44844484

4485-
if (zc == ZC2_IMPLICIT_OPEN)
4486-
zbc_close_zone(devip, zsp);
44874485
zbc_open_zone(devip, zsp, true);
44884486
fini:
44894487
write_unlock(macc_lckp);

0 commit comments

Comments
 (0)