diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-05-31 14:43:50 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-06-01 13:10:46 -0600 |
| commit | 30181faae37fa80d3aa73672e5df5f2a5b8dea0a (patch) | |
| tree | 3481f39f48f01bf0f264956ae97477f195a61b49 /fs/nfsd | |
| parent | 73d17701db503382eeed03afb3a6c39ec4d9a5c7 (diff) | |
| download | linux-30181faae37fa80d3aa73672e5df5f2a5b8dea0a.tar.bz2 | |
nfsd: Check queue type before submitting a SCSI request
Since using scsi_req() is only allowed against request queues for
which struct scsi_request is the first member of their private
request data, refuse to submit SCSI commands against a queue for
which this is not the case.
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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: J. Bruce Fields <bfields@redhat.com>
Cc: Jeff Layton <jlayton@poochiereds.net>
Cc: Omar Sandoval <osandov@fb.com>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/blocklayout.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c index fb5213afc854..47ed19c53f2e 100644 --- a/fs/nfsd/blocklayout.c +++ b/fs/nfsd/blocklayout.c @@ -219,6 +219,9 @@ static int nfsd4_scsi_identify_device(struct block_device *bdev, u8 *buf, *d, type, assoc; int error; + if (WARN_ON_ONCE(!blk_queue_scsi_passthrough(q))) + return -EINVAL; + buf = kzalloc(bufflen, GFP_KERNEL); if (!buf) return -ENOMEM; |