[03/19] bsg: Check queue type before attaching to a queue
diff mbox

Message ID 20170525184327.23570-4-bart.vanassche@sandisk.com
State New
Headers show

Commit Message

Bart Van Assche May 25, 2017, 6:43 p.m. UTC
Since BSG only supports request queues for which struct scsi_request
is the first member of their private request data, refuse to register
block layer queues for which struct scsi_request is not the first
member of their private data.

References: commit bd1599d931ca ("scsi_transport_sas: fix BSG ioctl memory corruption")
References: commit 82ed4db499b8 ("block: split scsi_request out of struct request")
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Omar Sandoval <osandov@fb.com>
Cc: linux-block@vger.kernel.org
 block/bsg.c | 6 ++++++
 1 file changed, 6 insertions(+)


Christoph Hellwig May 26, 2017, 6:02 a.m. UTC | #1
Looks fine,

Reviewed-by: Christoph Hellwig <hch@lst.de>

diff mbox

diff --git a/block/bsg.c b/block/bsg.c
index 6fd08544d77e..5871bbe70ccd 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -750,6 +750,12 @@  static struct bsg_device *bsg_add_device(struct inode *inode,
 #ifdef BSG_DEBUG
 	unsigned char buf[32];
+	if (!blk_queue_scsi_pdu(rq)) {
+		WARN_ONCE(true, "Attempt to register a non-SCSI queue\n");
+		return ERR_PTR(-EINVAL);
+	}
 	if (!blk_get_queue(rq))
 		return ERR_PTR(-ENXIO);