linux-kernel - Re: [PATCH 03/10] block: loop: use blk_is_valid_logical_block

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CY4PR04MB375172789B9725F132B94216E7780@CY4PR04MB3751.namprd04.prod.outlook.com>
Date:   Tue, 21 Jul 2020 11:08:40 +0000
From:   Damien Le Moal <Damien.LeMoal@....com>
To:     Maxim Levitsky <mlevitsk@...hat.com>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
CC:     Keith Busch <kbusch@...nel.org>,
        Josef Bacik <josef@...icpanda.com>,
        "open list:BLOCK LAYER" <linux-block@...r.kernel.org>,
        Sagi Grimberg <sagi@...mberg.me>, Jens Axboe <axboe@...nel.dk>,
        "open list:NVM EXPRESS DRIVER" <linux-nvme@...ts.infradead.org>,
        "open list:SCSI CDROM DRIVER" <linux-scsi@...r.kernel.org>,
        Tejun Heo <tj@...nel.org>,
        Bart Van Assche <bvanassche@....org>,
        "Martin K. Petersen" <martin.petersen@...cle.com>,
        Jason Wang <jasowang@...hat.com>,
        Maxim Levitsky <maximlevitsky@...il.com>,
        Stefan Hajnoczi <stefanha@...hat.com>,
        Colin Ian King <colin.king@...onical.com>,
        "Michael S. Tsirkin" <mst@...hat.com>,
        Paolo Bonzini <pbonzini@...hat.com>,
        Ulf Hansson <ulf.hansson@...aro.org>,
        Ajay Joshi <Ajay.Joshi@....com>,
        Ming Lei <ming.lei@...hat.com>,
        "open list:SONY MEMORYSTICK SUBSYSTEM" <linux-mmc@...r.kernel.org>,
        Christoph Hellwig <hch@....de>,
        Satya Tangirala <satyat@...gle.com>,
        "open list:NETWORK BLOCK DEVICE (NBD)" <nbd@...er.debian.org>,
        Hou Tao <houtao1@...wei.com>, Jens Axboe <axboe@...com>,
        "open list:VIRTIO CORE AND NET DRIVERS" 
        <virtualization@...ts.linux-foundation.org>,
        "James E.J. Bottomley" <jejb@...ux.ibm.com>,
        Alex Dubov <oakad@...oo.com>
Subject: Re: [PATCH 03/10] block: loop: use blk_is_valid_logical_block_size

On 2020/07/21 19:54, Maxim Levitsky wrote:
> This allows to remove loop's own check for supported block size
> 
> Signed-off-by: Maxim Levitsky <mlevitsk@...hat.com>
> ---
>  drivers/block/loop.c | 23 +++++------------------
>  1 file changed, 5 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/block/loop.c b/drivers/block/loop.c
> index 475e1a738560d..9984c8f824271 100644
> --- a/drivers/block/loop.c
> +++ b/drivers/block/loop.c
> @@ -228,19 +228,6 @@ static void __loop_update_dio(struct loop_device *lo, bool dio)
>  		blk_mq_unfreeze_queue(lo->lo_queue);
>  }
>  
> -/**
> - * loop_validate_block_size() - validates the passed in block size
> - * @bsize: size to validate
> - */
> -static int
> -loop_validate_block_size(unsigned short bsize)
> -{
> -	if (bsize < 512 || bsize > PAGE_SIZE || !is_power_of_2(bsize))
> -		return -EINVAL;
> -
> -	return 0;
> -}
> -
>  /**
>   * loop_set_size() - sets device size and notifies userspace
>   * @lo: struct loop_device to set the size for
> @@ -1119,9 +1106,10 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
>  	}
>  
>  	if (config->block_size) {
> -		error = loop_validate_block_size(config->block_size);
> -		if (error)
> +		if (!blk_is_valid_logical_block_size(config->block_size)) {
> +			error = -EINVAL;
>  			goto out_unlock;
> +		}
>  	}
>  
>  	error = loop_set_status_from_info(lo, &config->info);
> @@ -1607,9 +1595,8 @@ static int loop_set_block_size(struct loop_device *lo, unsigned long arg)
>  	if (lo->lo_state != Lo_bound)
>  		return -ENXIO;
>  
> -	err = loop_validate_block_size(arg);
> -	if (err)
> -		return err;
> +	if (!blk_is_valid_logical_block_size(arg))
> +		return -EINVAL;
>  
>  	if (lo->lo_queue->limits.logical_block_size == arg)
>  		return 0;
> 

Looks good to me.

Reviewed-by: Damien Le Moal <damien.lemoal@....com>

-- 
Damien Le Moal
Western Digital Research