Skip to content

Commit c462ecd

Browse files
metaspaceaxboe
authored andcommitted
null_blk: fix validation of block size
Block size should be between 512 and 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://lore.kernel.org/all/87wmn8mocd.fsf@metaspace.dk/ Signed-off-by: Andreas Hindborg <a.hindborg@samsung.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20240603192645.977968-1-nmi@metaspace.dk [axboe: remove unnecessary braces and != 0 check] Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 0a751df commit c462ecd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/block/null_blk/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,8 +1824,8 @@ static int null_validate_conf(struct nullb_device *dev)
18241824
dev->queue_mode = NULL_Q_MQ;
18251825
}
18261826

1827-
dev->blocksize = round_down(dev->blocksize, 512);
1828-
dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096);
1827+
if (blk_validate_block_size(dev->blocksize))
1828+
return -EINVAL;
18291829

18301830
if (dev->use_per_node_hctx) {
18311831
if (dev->submit_queues != nr_online_nodes)

0 commit comments

Comments
 (0)