Commit 6f64f866 authored by Min Li's avatar Min Li Committed by Jens Axboe

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: default avatarMin Li <min15.li@samsung.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230629142517.121241-1-min15.li@samsung.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5fa3d1a0
...@@ -18,7 +18,7 @@ static int blkpg_do_ioctl(struct block_device *bdev, ...@@ -18,7 +18,7 @@ static int blkpg_do_ioctl(struct block_device *bdev,
{ {
struct gendisk *disk = bdev->bd_disk; struct gendisk *disk = bdev->bd_disk;
struct blkpg_partition p; struct blkpg_partition p;
long long start, length; sector_t start, length;
if (disk->flags & GENHD_FL_NO_PART) if (disk->flags & GENHD_FL_NO_PART)
return -EINVAL; return -EINVAL;
...@@ -35,14 +35,17 @@ static int blkpg_do_ioctl(struct block_device *bdev, ...@@ -35,14 +35,17 @@ static int blkpg_do_ioctl(struct block_device *bdev,
if (op == BLKPG_DEL_PARTITION) if (op == BLKPG_DEL_PARTITION)
return bdev_del_partition(disk, p.pno); return bdev_del_partition(disk, p.pno);
if (p.start < 0 || p.length <= 0 || p.start + p.length < 0)
return -EINVAL;
/* Check that the partition is aligned to the block size */
if (!IS_ALIGNED(p.start | p.length, bdev_logical_block_size(bdev)))
return -EINVAL;
start = p.start >> SECTOR_SHIFT; start = p.start >> SECTOR_SHIFT;
length = p.length >> SECTOR_SHIFT; length = p.length >> SECTOR_SHIFT;
switch (op) { switch (op) {
case BLKPG_ADD_PARTITION: case BLKPG_ADD_PARTITION:
/* check if partition is aligned to blocksize */
if (p.start & (bdev_logical_block_size(bdev) - 1))
return -EINVAL;
return bdev_add_partition(disk, p.pno, start, length); return bdev_add_partition(disk, p.pno, start, length);
case BLKPG_RESIZE_PARTITION: case BLKPG_RESIZE_PARTITION:
return bdev_resize_partition(disk, p.pno, start, length); return bdev_resize_partition(disk, p.pno, start, length);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment