Skip to content

Commit 566eeee

Browse files
author
Ming Lei
committed
block: add check that partition length needs to be aligned with block size
JIRA: https://issues.redhat.com/browse/RHEL-26616 CVE: CVE-2023-52458 commit 6f64f86 Author: Min Li <min15.li@samsung.com> Date: Thu Jun 29 14:25:17 2023 +0000 block: add check that partition length needs to be aligned with block size Before calling add partition or resize partition, there is no check on whether the length is aligned with the logical block size. If the logical block size of the disk is larger than 512 bytes, then the partition size maybe not the multiple of the logical block size, and when the last sector is read, bio_truncate() will adjust the bio size, resulting in an IO error if the size of the read command is smaller than the logical block size.If integrity data is supported, this will also result in a null pointer dereference when calling bio_integrity_free. Cc: <stable@vger.kernel.org> Signed-off-by: Min Li <min15.li@samsung.com> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20230629142517.121241-1-min15.li@samsung.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Ming Lei <ming.lei@redhat.com>
1 parent 73043ff commit 566eeee

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

block/ioctl.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ static int blkpg_do_ioctl(struct block_device *bdev,
1818
{
1919
struct gendisk *disk = bdev->bd_disk;
2020
struct blkpg_partition p;
21-
long long start, length;
21+
sector_t start, length;
2222

2323
if (!capable(CAP_SYS_ADMIN))
2424
return -EACCES;
@@ -33,14 +33,17 @@ static int blkpg_do_ioctl(struct block_device *bdev,
3333
if (op == BLKPG_DEL_PARTITION)
3434
return bdev_del_partition(disk, p.pno);
3535

36+
if (p.start < 0 || p.length <= 0 || p.start + p.length < 0)
37+
return -EINVAL;
38+
/* Check that the partition is aligned to the block size */
39+
if (!IS_ALIGNED(p.start | p.length, bdev_logical_block_size(bdev)))
40+
return -EINVAL;
41+
3642
start = p.start >> SECTOR_SHIFT;
3743
length = p.length >> SECTOR_SHIFT;
3844

3945
switch (op) {
4046
case BLKPG_ADD_PARTITION:
41-
/* check if partition is aligned to blocksize */
42-
if (p.start & (bdev_logical_block_size(bdev) - 1))
43-
return -EINVAL;
4447
return bdev_add_partition(disk, p.pno, start, length);
4548
case BLKPG_RESIZE_PARTITION:
4649
return bdev_resize_partition(disk, p.pno, start, length);

0 commit comments

Comments
 (0)