Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <5b0eaf1d-60b1-532e-7d12-c67810541902@kernel.org>
Date:   Fri, 16 Jun 2023 20:52:55 +0900
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.12.0
Subject: Re: [PATCH v3] block: add capacity validation in bdev_add_partition()
Content-Language: en-US
To:     "min.li" <min15.li@samsung.com>, axboe@kernel.dk,
        willy@infradead.org, hch@lst.de, gregkh@linuxfoundation.org,
        wsa@kernel.org, vkoul@kernel.org
Cc:     linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
References: <CGME20230616092054epcas5p340e977377808d2df7210dc4a7d6c1d8e@epcas5p3.samsung.com>
 <20230616171913.13045-1-min15.li@samsung.com>
From:   Damien Le Moal <dlemoal@kernel.org>
Organization: Western Digital Research
In-Reply-To: <20230616171913.13045-1-min15.li@samsung.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 6/17/23 02:19, min.li wrote:
> In the function bdev_add_partition(),there is no check that the start
> and end sectors exceed the size of the disk before calling add_partition.
> When we call the block's ioctl interface directly to add a partition,
> and the capacity of the disk is set to 0 by driver,the command will
> continue to execute.
> 
> Signed-off-by: min.li <min15.li@samsung.com>

I am guessing this should be:

Signed-off-by: Min Li <min15.li@samsung.com>

No ? The signed-off-by tag, and any other tag, must have your full name
correctly written.

> Reviewed-by: Christoph Hellwig <hch@lst.de>
> 
> ---
> Changes from v1:
> 
> - Check for overflows of the start + length value.
> - Place the capacity check at the beginning of the function.
> 
> Changes from v2:
> 
> - Place the assignment on the first line and merge the two lines into one.
> - Modify the singed name.
> ---
>  block/partitions/core.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/block/partitions/core.c b/block/partitions/core.c
> index 49e0496ff23c..b511f88bf558 100644
> --- a/block/partitions/core.c
> +++ b/block/partitions/core.c
> @@ -436,10 +436,21 @@ static bool partition_overlaps(struct gendisk *disk, sector_t start,
>  int bdev_add_partition(struct gendisk *disk, int partno, sector_t start,
>  		sector_t length)
>  {
> +	sector_t capacity = get_capacity(disk), end;
>  	struct block_device *part;
>  	int ret;
>  
>  	mutex_lock(&disk->open_mutex);
> +	if (check_add_overflow(start, length, &end)) {
> +		ret = -EINVAL;
> +		goto out;
> +	}
> +
> +	if (start >= capacity || end > capacity) {
> +		ret = -EINVAL;
> +		goto out;
> +	}
> +
>  	if (!disk_live(disk)) {
>  		ret = -ENXIO;
>  		goto out;

-- 
Damien Le Moal
Western Digital Research