Return-Path: Received: from esa6.hgst.iphmx.com ([216.71.154.45]:61216 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1036473AbdEYSnj (ORCPT ); Thu, 25 May 2017 14:43:39 -0400 From: Bart Van Assche To: Jens Axboe CC: , Christoph Hellwig , "Bart Van Assche" , "J . Bruce Fields" , Jeff Layton , Jens Axboe , Omar Sandoval , Subject: [PATCH 06/19] nfsd: Check private request size before submitting a SCSI request Date: Thu, 25 May 2017 11:43:14 -0700 Message-ID: <20170525184327.23570-7-bart.vanassche@sandisk.com> In-Reply-To: <20170525184327.23570-1-bart.vanassche@sandisk.com> References: <20170525184327.23570-1-bart.vanassche@sandisk.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-nfs-owner@vger.kernel.org List-ID: 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 Reviewed-by: Hannes Reinecke Cc: J. Bruce Fields Cc: Jeff Layton Cc: Jens Axboe Cc: Christoph Hellwig Cc: Omar Sandoval 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..38e14cf7e74a 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_pdu(q))) + return -EINVAL; + buf = kzalloc(bufflen, GFP_KERNEL); if (!buf) return -ENOMEM; -- 2.12.2