Merge: null_blk: fix validation of block size

zampierilucas · zampierilucas · commit d3db2cd73880 · 2024-08-22T12:58:57.000Z
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5028 JIRA: https://issues.redhat.com/browse/RHEL-51322 CVE: CVE-2024-41077 Signed-off-by: Ming Lei <ming.lei@redhat.com> Approved-by: Jeff Moyer <jmoyer@redhat.com> Approved-by: Jay Shin <jaeshin@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
@@ -2049,8 +2049,8 @@ static int null_validate_conf(struct nullb_device *dev)
 		return -EINVAL;
 	}
 
-	dev->blocksize = round_down(dev->blocksize, 512);
-	dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096);
+	if (blk_validate_block_size(dev->blocksize))
+		return -EINVAL;
 
 	if (dev->queue_mode == NULL_Q_MQ && dev->use_per_node_hctx) {
 		if (dev->submit_queues != nr_online_nodes)

Original file line number	Diff line number	Diff line change
`@@ -2049,8 +2049,8 @@ static int null_validate_conf(struct nullb_device *dev)`
`2049`	`2049`	`return -EINVAL;`
`2050`	`2050`	`}`
`2051`	`2051`
`2052`		`- dev->blocksize = round_down(dev->blocksize, 512);`
`2053`		`- dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096);`
	`2052`	`+ if (blk_validate_block_size(dev->blocksize))`
	`2053`	`+ return -EINVAL;`
`2054`	`2054`
`2055`	`2055`	`if (dev->queue_mode == NULL_Q_MQ && dev->use_per_node_hctx) {`
`2056`	`2056`	`if (dev->submit_queues != nr_online_nodes)`