diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-19 13:46:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-19 13:46:48 -0400 |
| commit | 73030efad5bd280ae9c3b5073710786e6300906e (patch) | |
| tree | 4b029028c722878b1ee202a12132fec87b98e056 /include | |
| parent | 598a0c7d0932e385486b173768f03d95bf5507c8 (diff) | |
| parent | f81426a84bef870d26e5e752772d8ca203cd4aed (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_tcq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h index cdcc90b07ecb..e64583560701 100644 --- a/include/scsi/scsi_tcq.h +++ b/include/scsi/scsi_tcq.h | |||
| @@ -68,7 +68,7 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth) | |||
| 68 | return; | 68 | return; |
| 69 | 69 | ||
| 70 | if (!shost_use_blk_mq(sdev->host) && | 70 | if (!shost_use_blk_mq(sdev->host) && |
| 71 | blk_queue_tagged(sdev->request_queue)) | 71 | !blk_queue_tagged(sdev->request_queue)) |
| 72 | blk_queue_init_tags(sdev->request_queue, depth, | 72 | blk_queue_init_tags(sdev->request_queue, depth, |
| 73 | sdev->host->bqt); | 73 | sdev->host->bqt); |
| 74 | 74 | ||