Return-Path: Received: from esa2.hgst.iphmx.com ([68.232.143.124]:10207 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755096AbdESSa0 (ORCPT ); Fri, 19 May 2017 14:30:26 -0400 From: Bart Van Assche To: "Martin K . Petersen" , James Bottomley CC: , Bart Van Assche , "J . Bruce Fields" , "Jeff Layton" , Jens Axboe , "Christoph Hellwig" , Omar Sandoval , Hannes Reinecke , , Subject: [PATCH 05/18] nfsd: Check private request size before submitting a SCSI request Date: Fri, 19 May 2017 11:30:03 -0700 Message-ID: <20170519183016.12646-6-bart.vanassche@sandisk.com> In-Reply-To: <20170519183016.12646-1-bart.vanassche@sandisk.com> References: <20170519183016.12646-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 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 Cc: J. Bruce Fields Cc: Jeff Layton Cc: Jens Axboe Cc: Christoph Hellwig Cc: Omar Sandoval Cc: Hannes Reinecke 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