* [PATCH 05/18] nfsd: Check private request size before submitting a SCSI request [not found] <20170519183016.12646-1-bart.vanassche@sandisk.com> @ 2017-05-19 18:30 ` Bart Van Assche 2017-05-19 19:03 ` J . Bruce Fields 0 siblings, 1 reply; 2+ messages in thread From: Bart Van Assche @ 2017-05-19 18:30 UTC (permalink / raw) To: Martin K . Petersen, James Bottomley Cc: linux-scsi, Bart Van Assche, J . Bruce Fields, Jeff Layton, Jens Axboe, Christoph Hellwig, Omar Sandoval, Hannes Reinecke, linux-nfs, linux-block 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 register block layer queues for which the private data is smaller than struct scsi_request. References: commit 82ed4db499b8 ("block: split scsi_request out of struct request") Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Cc: J. Bruce Fields <bfields@fieldses.org> Cc: Jeff Layton <jlayton@poochiereds.net> Cc: Jens Axboe <axboe@fb.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Omar Sandoval <osandov@fb.com> Cc: Hannes Reinecke <hare@suse.com> Cc: linux-nfs@vger.kernel.org Cc: linux-block@vger.kernel.org --- fs/nfsd/blocklayout.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c index fb5213afc854..90d1df31491b 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_cmd_size(q) < sizeof(struct scsi_request))) + return -EINVAL; + buf = kzalloc(bufflen, GFP_KERNEL); if (!buf) return -ENOMEM; -- 2.12.2 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 05/18] nfsd: Check private request size before submitting a SCSI request 2017-05-19 18:30 ` [PATCH 05/18] nfsd: Check private request size before submitting a SCSI request Bart Van Assche @ 2017-05-19 19:03 ` J . Bruce Fields 0 siblings, 0 replies; 2+ messages in thread From: J . Bruce Fields @ 2017-05-19 19:03 UTC (permalink / raw) To: Bart Van Assche Cc: Martin K . Petersen, James Bottomley, linux-scsi, Jeff Layton, Jens Axboe, Christoph Hellwig, Omar Sandoval, Hannes Reinecke, linux-nfs, linux-block ACK as far as I'm concerned.--b. On Fri, May 19, 2017 at 11:30:03AM -0700, Bart Van Assche wrote: > 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 register block layer queues for which the private > data is smaller than struct scsi_request. > > References: commit 82ed4db499b8 ("block: split scsi_request out of struct request") > Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> > Cc: J. Bruce Fields <bfields@fieldses.org> > Cc: Jeff Layton <jlayton@poochiereds.net> > Cc: Jens Axboe <axboe@fb.com> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Omar Sandoval <osandov@fb.com> > Cc: Hannes Reinecke <hare@suse.com> > Cc: linux-nfs@vger.kernel.org > Cc: linux-block@vger.kernel.org > --- > fs/nfsd/blocklayout.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c > index fb5213afc854..90d1df31491b 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_cmd_size(q) < sizeof(struct scsi_request))) > + return -EINVAL; > + > buf = kzalloc(bufflen, GFP_KERNEL); > if (!buf) > return -ENOMEM; > -- > 2.12.2 ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-19 19:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20170519183016.12646-1-bart.vanassche@sandisk.com>
2017-05-19 18:30 ` [PATCH 05/18] nfsd: Check private request size before submitting a SCSI request Bart Van Assche
2017-05-19 19:03 ` J . Bruce Fields
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox