Commit 73030efa 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:
 "This is a set of three fixes.

  One represents a nasty shared tag map regression (another inverted
  condition) caused by recent SCSI MQ patches, one is a longstanding
  potential buffer overrun in the iscsi data buffer and the final one is
  a use after free for the rare bidirectional commands"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  [SCSI] fix for bidi use after free
  [SCSI] fix regression that accidentally disabled block-based tcq
  [SCSI] libiscsi: fix potential buffer overrun in __iscsi_conn_send_pdu
parents 598a0c7d f81426a8

drivers/scsi/libiscsi.c

+10 −0
Original line number Diff line number Diff line
@@ -717,11 +717,21 @@ __iscsi_conn_send_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 
			return NULL;

		}



		if (data_size > ISCSI_DEF_MAX_RECV_SEG_LEN) {

			iscsi_conn_printk(KERN_ERR, conn, "Invalid buffer len of %u for login task. Max len is %u\n", data_size, ISCSI_DEF_MAX_RECV_SEG_LEN);

			return NULL;

		}



		task = conn->login_task;

	} else {

		if (session->state != ISCSI_STATE_LOGGED_IN)

			return NULL;



		if (data_size != 0) {

			iscsi_conn_printk(KERN_ERR, conn, "Can not send data buffer of len %u for op 0x%x\n", data_size, opcode);

			return NULL;

		}



		BUG_ON(conn->c_stage == ISCSI_CONN_INITIAL_STAGE);

		BUG_ON(conn->c_stage == ISCSI_CONN_STOPPED);

drivers/scsi/scsi_lib.c

+3 −2
Original line number Diff line number Diff line
@@ -733,12 +733,13 @@ static bool scsi_end_request(struct request *req, int error, 
	} else {

		unsigned long flags;



		if (bidi_bytes)

			scsi_release_bidi_buffers(cmd);



		spin_lock_irqsave(q->queue_lock, flags);

		blk_finish_request(req, error);

		spin_unlock_irqrestore(q->queue_lock, flags);



		if (bidi_bytes)

			scsi_release_bidi_buffers(cmd);

		scsi_release_buffers(cmd);

		scsi_next_command(cmd);

	}

include/scsi/scsi_tcq.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth) 
		return;



	if (!shost_use_blk_mq(sdev->host) &&

	    blk_queue_tagged(sdev->request_queue))

	    !blk_queue_tagged(sdev->request_queue))

		blk_queue_init_tags(sdev->request_queue, depth,

				    sdev->host->bqt);

CRA Git | Maintained and supported by SUSTech CRA and CCSE