Received-SPF: pass (google.com: domain of linux-kernel+bounces-198494-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <9d68c7c1-b1e6-4f42-8d4b-8c986ab688b5@kernel.org>
Date: Mon, 3 Jun 2024 08:59:10 +0900
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] null_blk: fix validation of block size
To: John Garry <john.g.garry@oracle.com>, Andreas Hindborg
 <nmi@metaspace.dk>, Jens Axboe <axboe@kernel.dk>
Cc: Andreas Hindborg <a.hindborg@samsung.com>, Keith Busch
 <kbusch@kernel.org>, linux-block@vger.kernel.org,
 linux-kernel@vger.kernel.org
References: <20240601202351.691952-1-nmi@metaspace.dk>
 <d6999fef-aadf-494e-ad58-f27dfd975535@oracle.com>
From: Damien Le Moal <dlemoal@kernel.org>
Content-Language: en-US
Organization: Western Digital Research
In-Reply-To: <d6999fef-aadf-494e-ad58-f27dfd975535@oracle.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 6/2/24 19:57, John Garry wrote:
> On 01/06/2024 21:23, Andreas Hindborg wrote:
>> From: Andreas Hindborg <a.hindborg@samsung.com>
>>
>> Block size should be between 512
> 
> 
>> and 4096
> 
> Or PAGE_SIZE?

PAGE_SIZE can be larger than 4096. But most drives are 512 or 4096 LBA-sized.

> 
>   and be a power of 2. The current
>> check does not validate this, so update the check.
>>
>> Without this patch, null_blk would Oops due to a null pointer deref when
>> loaded with bs=1536 [1].
>>
>> Link: https://urldefense.com/v3/__https://lore.kernel.org/all/87wmn8mocd.fsf@metaspace.dk/__;!!ACWV5N9M2RV99hQ!OWXI3DGxeIAWvKfM5oVSiA5fTWmiRvUctIdVrcBcKnO_HF-vgkarVfd27jkvQ1-JjNgX5IFIvBWcsUttvg$
>>
>> Signed-off-by: Andreas Hindborg <a.hindborg@samsung.com>
>> ---
>>   drivers/block/null_blk/main.c | 6 ++++--
>>   1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
>> index eb023d267369..6a26888c52bb 100644
>> --- a/drivers/block/null_blk/main.c
>> +++ b/drivers/block/null_blk/main.c
>> @@ -1823,8 +1823,10 @@ static int null_validate_conf(struct nullb_device *dev)
>>   		dev->queue_mode = NULL_Q_MQ;
>>   	}
>>   
>> -	dev->blocksize = round_down(dev->blocksize, 512);
>> -	dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096);
>> +	if ((dev->blocksize < 512 || dev->blocksize > 4096) ||
>> +	    ((dev->blocksize & (dev->blocksize - 1)) != 0)) {
>> +		return -EINVAL;
>> +	}
> 
> Looks like blk_validate_block_size(), modulo PAGE_SIZE check

Not PAGE_SIZE...

> 
>>   
>>   	if (dev->use_per_node_hctx) {
>>   		if (dev->submit_queues != nr_online_nodes)
>>
>> base-commit: 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0
> 
> 

-- 
Damien Le Moal
Western Digital Research