Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1d61e7f 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:
 "Nine fixes, five in the qla2xxx driver, the most serious of which is
  the uninitialized list head crash which can be observed in most
  systems under a sufficiently loaded low memory environment.

  The two sg fixes are minor but obvious and two target ones which seem
  reasonable but not high impact"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qla2xxx: Return error when TMF returns
  scsi: qla2xxx: Fix ISP recovery on unload
  scsi: qla2xxx: Fix driver unload by shutting down chip
  scsi: qla2xxx: Fix NPIV deletion by calling wait_for_sess_deletion
  scsi: qla2xxx: Fix unintialized List head crash
  scsi: sg: update comment for blk_get_request()
  scsi: sg: fix minor memory leak in error path
  scsi: libiscsi: fix possible NULL pointer dereference in case of TMF
  scsi: target: iscsi: cxgbit: fix max iso npdu calculation
parents 095c3633 b4146c49

drivers/scsi/libiscsi.c

+6 −6
Original line number Diff line number Diff line
@@ -284,11 +284,11 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode) 
		 */

		if (opcode != ISCSI_OP_SCSI_DATA_OUT) {

			iscsi_conn_printk(KERN_INFO, conn,

					  "task [op %x/%x itt "

					  "task [op %x itt "

					  "0x%x/0x%x] "

					  "rejected.\n",

					  task->hdr->opcode, opcode,

					  task->itt, task->hdr_itt);

					  opcode, task->itt,

					  task->hdr_itt);

			return -EACCES;

		}

		/*
@@ -297,10 +297,10 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode) 
		 */

		if (conn->session->fast_abort) {

			iscsi_conn_printk(KERN_INFO, conn,

					  "task [op %x/%x itt "

					  "task [op %x itt "

					  "0x%x/0x%x] fast abort.\n",

					  task->hdr->opcode, opcode,

					  task->itt, task->hdr_itt);

					  opcode, task->itt,

					  task->hdr_itt);

			return -EACCES;

		}

		break;

drivers/scsi/qla2xxx/qla_attr.c

+1 −0
Original line number Diff line number Diff line
@@ -2141,6 +2141,7 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) 
		msleep(1000);



	qla24xx_disable_vp(vha);

	qla2x00_wait_for_sess_deletion(vha);



	vha->flags.delete_progress = 1;

drivers/scsi/qla2xxx/qla_gbl.h

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ void qla2x00_handle_login_done_event(struct scsi_qla_host *, fc_port_t *, 
int qla24xx_post_gnl_work(struct scsi_qla_host *, fc_port_t *);

int qla24xx_async_abort_cmd(srb_t *);

int qla24xx_post_relogin_work(struct scsi_qla_host *vha);

void qla2x00_wait_for_sess_deletion(scsi_qla_host_t *);



/*

 * Global Functions in qla_mid.c source file.

drivers/scsi/qla2xxx/qla_gs.c

+4 −0
Original line number Diff line number Diff line
@@ -3708,6 +3708,10 @@ int qla24xx_async_gpnid(scsi_qla_host_t *vha, port_id_t *id) 
	return rval;



done_free_sp:

	spin_lock_irqsave(&vha->hw->vport_slock, flags);

	list_del(&sp->elem);

	spin_unlock_irqrestore(&vha->hw->vport_slock, flags);



	if (sp->u.iocb_cmd.u.ctarg.req) {

		dma_free_coherent(&vha->hw->pdev->dev,

			sizeof(struct ct_sns_pkt),

drivers/scsi/qla2xxx/qla_init.c

+3 −4
Original line number Diff line number Diff line
@@ -1489,11 +1489,10 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun, 


	wait_for_completion(&tm_iocb->u.tmf.comp);



	rval = tm_iocb->u.tmf.comp_status == CS_COMPLETE ?

	    QLA_SUCCESS : QLA_FUNCTION_FAILED;

	rval = tm_iocb->u.tmf.data;



	if ((rval != QLA_SUCCESS) || tm_iocb->u.tmf.data) {

		ql_dbg(ql_dbg_taskm, vha, 0x8030,

	if (rval != QLA_SUCCESS) {

		ql_log(ql_log_warn, vha, 0x8030,

		    "TM IOCB failed (%x).\n", rval);

	}