From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxim Levitsky Subject: [PATCH 07/10] block: mspro_blk: use blk_is_valid_logical_block_size Date: Tue, 21 Jul 2020 13:52:36 +0300 Message-ID: <20200721105239.8270-8-mlevitsk@redhat.com> References: <20200721105239.8270-1-mlevitsk@redhat.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20200721105239.8270-1-mlevitsk@redhat.com> Sender: linux-scsi-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: Keith Busch , Josef Bacik , "open list:BLOCK LAYER" , Sagi Grimberg , Jens Axboe , "open list:NVM EXPRESS DRIVER" , "open list:SCSI CDROM DRIVER" , Tejun Heo , Bart Van Assche , "Martin K. Petersen" , Damien Le Moal , Jason Wang , Maxim Levitsky , Stefan Hajnoczi , Colin Ian King , "Michael S. Tsirkin" , Paolo Bonzini , Ulf Hansson , Ajay Joshi List-Id: virtualization@lists.linuxfoundation.org Signed-off-by: Maxim Levitsky --- drivers/memstick/core/mspro_block.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index cd6b8d4f23350..86c9eb0aef512 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c @@ -1199,6 +1199,12 @@ static int mspro_block_init_disk(struct memstick_dev *card) msb->page_size = be16_to_cpu(sys_info->unit_size); + if (!(blk_is_valid_logical_block_size(msb->page_size))) { + dev_warn(&card->dev, + "unsupported block size %d", msb->page_size); + return -EINVAL; + } + mutex_lock(&mspro_block_disk_lock); disk_id = idr_alloc(&mspro_block_disk_idr, card, 0, 256, GFP_KERNEL); mutex_unlock(&mspro_block_disk_lock); -- 2.26.2