Commit d9f97264 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe

bsg: Check queue type before attaching to a queue

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 bd1599d9 ("scsi_transport_sas: fix BSG ioctl memory corruption")
References: commit 82ed4db4 ("block: split scsi_request out of struct request")
Signed-off-by: default avatarBart Van Assche <>
Reviewed-by: default avatarHannes Reinecke <>
Reviewed-by: default avatarChristoph Hellwig <>
Cc: Omar Sandoval <>
Signed-off-by: default avatarJens Axboe <>
parent 9efc160f
......@@ -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_passthrough(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);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment