Received-SPF: pass (google.com: domain of linux-kernel+bounces-198200-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <d6999fef-aadf-494e-ad58-f27dfd975535@oracle.com>
Date: Sun, 2 Jun 2024 11:57:03 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] null_blk: fix validation of block size
To: 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>
Content-Language: en-US
From: John Garry <john.g.garry@oracle.com>
Organization: Oracle Corporation
In-Reply-To: <20240601202351.691952-1-nmi@metaspace.dk>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?utf-8?B?R0VJVG5RSndkWFErS0FqeEdBMGFmcmowbnpRM3JJUG0rU3J0c2xGK2VURk1o?=
 =?utf-8?B?MStEWCtFTklDK29hcUV5Q0hXRE42WUkvUitFSUtCdFJJVk1wTFVoQnp5MUtX?=
 =?utf-8?B?aDFlM290Wm9WUGROK09oZHU5ajhKaElleTVqdktsYTQ3V25QOUNKWFc5OGxZ?=
 =?utf-8?B?WitibDJQWjdId3V2THRRaXl3RDBmOWtudWt3dU1XNWk2TWt6OTZ5dmM0SFV2?=
 =?utf-8?B?bWVJbHlEWVJZNWdxbi94eUNTVDFpUUkxeEZHTWRTZlFxOFdJOS9kK0xkR3ZX?=
 =?utf-8?B?U3RyWkwxSHBSb0Q5ZytoSldUMzFaNTN6QXAxRWhVSE5jd2VjY2xEdGZRMk44?=
 =?utf-8?B?djJndGNaTGxBOHJRbmxuY3NpaHJlaEZpL1NGREVJVDlGUkNhTnNxUWRrN0pU?=
 =?utf-8?B?NVUya3YwNVcxd1QxQTdxbmw5Y1BZVWo3YnhVR09NZENjbkZEcXRHRWQ5R0Ju?=
 =?utf-8?B?RGVsSmlWYWh1R01vbitQYmJsNmJzdmtkbHNDalFJLzVneHhBaGMyY3QvS2NX?=
 =?utf-8?B?aUNWOWRjK1pZQ0lGWlovYnVqWG5YdStRVDVKdkkvZ21ENU9RaGFmOXo0MFNZ?=
 =?utf-8?B?SVozL2pEY3BTZzJ4S1c5dks1RlVpMjZpS3NHN2JWZW45dlB2ODNvQWpCTWFR?=
 =?utf-8?B?amJsQVlkWXArTENXeWxwa3FGcG5zQjUxcVV1bXUvdldJVTVFRFQvT3lRYkxq?=
 =?utf-8?B?bWJSTzluOVpUZVNNZnNnZHRuc2lYY0NsYWpBOVlxbnVrcEVmRk91RGtQbzRz?=
 =?utf-8?B?c2hvVFBhM3BDeUsrWUxuNXVvcUlNUjZuZ3g5OS9PVkpPWWQ5ZklWNU9ETWlN?=
 =?utf-8?B?aUJ0bUFENmZTdmdpMlV2NmNDQ0dPdTBYbVBPRExwaVBSMEZYRjVoOVdjeHpB?=
 =?utf-8?B?MytEYUI2LzRiaTN2ZE9mUWE1UHVtWFA0bFZpMk9LNCtSdlkzQmtITEV1YzlH?=
 =?utf-8?B?MHozT3FJa1RFVmxhZ1BqQW94MzU4bHQwUW14M01JTEtwM1VOMURBV3lkQW1i?=
 =?utf-8?B?c0wzckVJSy9Mdy9tZGx0Rm9zRUJ5SWhNdVZsRXdQWjJUZUZ5VlVrQTkydzFx?=
 =?utf-8?B?Q1Rxc0MzRHB2STFVMTliS3hPWnh1MDFraTczYmxFczZLWDVnOTJ5ZDJySDNK?=
 =?utf-8?B?RjBRZHovRG1rc3A3RkE3VkxRVnBCRmJzaTdCdWtzOG5oWjBnUklkVThwclh6?=
 =?utf-8?B?ZHIzazNxNFQyTTdKRWxOMkhCaUNjL2hXMDlYQWJPTGhWWm41OHovbGQ4MDla?=
 =?utf-8?B?MGVrdDQzWUtSRlA4TkV2VHdRME1UVEtUYi9PYytWbWQ2VDBiNndJUi8ySFl1?=
 =?utf-8?B?d3VHVmtlMXJhVGlpbXpXckF4cDZiSkdyOXlOSnVlOThmOWtSTU5LSVNkVlls?=
 =?utf-8?B?OVdPUWlNN0x2a0FjdmpNSDdzQkpBRmxJZm0xTEMvb2dzMGIrbnAySUdQRXB1?=
 =?utf-8?B?bkFPYzQrTFIxcEQyQ0hpM0RYNU9kaDcxa1JSWE40RHd0d3N0ZGdzZ3pDZmU2?=
 =?utf-8?B?V3BNclFBRW0ybTMrY3VGaGIvMTBwczBUSmkrS2NkVmhsVkJNaUE4aVVGVlA0?=
 =?utf-8?B?WlVlSk5HK2h0NnBTVzVRQlVGZmVCSXVmSTFva0RzQnBWTjlEbEc3RkZlWTIr?=
 =?utf-8?B?YXZYdTRFSTQ1RTRybmFCMWZ4b3pYV3EyR3QrdEp6NWJEQlNzYzZSQXVWYmVP?=
 =?utf-8?B?OFlCYXB5bnpzZmhKRXl3MnZQbWRVUlN5dmkySENFS2hjMHp0SFBrZ2hhbThp?=
 =?utf-8?B?RnVJcVhDc0c5TTNmcE9DL1dEM3NJWkF2QnQ4Q2tseVZsR0lqb2hjTEZBTzlt?=
 =?utf-8?B?NDBtVkFaOEl3aU5xNXRiUW1oYnJYQjY3cU5lV0tnWE5iYlcrMHpGUUtNK2ht?=
 =?utf-8?B?N0wyd2MrRHVRSjJRclFSTWFTRDJubm9tZDl4c0VPQnZqUE5takFZU2F0L0J1?=
 =?utf-8?B?TVg3SGRSVnhmTUx1cUtzekRrcnJ2ODI4WVl1TDl4eHFYb2pleXk1eU9DU0JG?=
 =?utf-8?B?K2FWSDFUbkE0ZEhXTUhZWlZ4R3ZwVm5mMTNNbGNKeW9CdTRwVXZNbHIrTFlM?=
 =?utf-8?B?bUZsckFIK09ONW44VHBTNW5RMm1RbDRUTENqR2FTZk5QOGxMYmdobWtSVHBk?=
 =?utf-8?Q?PQ0TMSVUEnjBfmZaUE7Fj3X2E?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	wuAk8jktp4cxgZ4+L27gNOQ0EVBI2hMnzYrKWMDOwRSFC8MnY7aYsWvCAQd4GjiS1U7MQZr97LBNZLOuUCSLPOQAseuGiiotLMa4oN/iqqQMR6T+ZNLcmCNdrMddznithVlUYBmlglgcQGgxepqbHFiBo9zudF8DfLuZ/wQm41VlTyVPrMqN63rnVTpGVPJyxoaooKsf5swAz4bqW7CAaTVMZO7HserpmYljotVF/S1brhGKfDJa+Nd+EpsBuCDh6I7aYwvVTDVZPImhU1+SRioDM+unP7/Luv+x86EJGP+0rkRu+mghM9uop83b85PHb3mRR1fN7PR6tX6Qc7SHo2ntUdxJhAyIM/UW3LUhrSDrJ8nk/3GyrRH3Ty9jJTDZVpLCNDCCv9hMCVXmwwMjg3tNsKCKcEpeA1Tqxj91S8kGIZB86GvJyA1BbKYV08/0MP1kbDGujPS9xHa0zWJtKfm9gU8yXaqAu9K9vUWxH3UkGa8RwoVrzt6aqegafLwlbQ2GkAglZONQDCI3kuG7TvXg33pQQfXEpiwNW8+qSx/teFQzwI74A5pqG/k7PSJCXXOzjKxhUhq+jdmGuje+iI5RIBJ7Os0H5xGiBrfvArQ=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 492a782d-17d5-4a7a-4316-08dc82f2bec0
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2024 10:57:07.6667
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ++etkopnzvSNC5UgiTbL/vXKAlBJMdmNPXXahrfZEEJqYWGrMpWR2kRWQPaXJrqzaXMPcpc+Gv55vWBF9PmvzA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6764
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16
 definitions=2024-06-01_19,2024-05-30_01,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 spamscore=0
 phishscore=0 adultscore=0 malwarescore=0 suspectscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2406020093
X-Proofpoint-GUID: oK3mfMDXs-Lu2WoJaQmPkh5O03DxLJda
X-Proofpoint-ORIG-GUID: oK3mfMDXs-Lu2WoJaQmPkh5O03DxLJda

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?

  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

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