block: add check that partition length needs to be aligned with block size
Subsystems (2)
PATCH 1/1 block: add check that partition length needs to be aligned with block size
From: Min Li <[email protected]>
[ Upstream commit 6f64f866aa1ae6975c95d805ed51d7e9433a0016]
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.
--- block/ioctl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
block/ioctl.c +7 -4
@@ -17,7 +17,7 @@ static int blkpg_do_ioctl(struct block_device *bdev, struct blkpg_partition __user *upart, int op) {struct blkpg_partition p; -long long start, length; +sector_t start, length;if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
@@ -32,6 +32,12 @@ static int blkpg_do_ioctl(struct block_device *bdev,if (op ==BLKPG_DEL_PARTITION )return bdev_del_partition (bdev, 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 ; length = p.length >>SECTOR_SHIFT ;
@@ -46,9 +52,6 @@ static int blkpg_do_ioctl(struct block_device *bdev,switch (op) {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 (bdev, p.pno, start, length);case BLKPG_RESIZE_PARTITION :return bdev_resize_partition (bdev, p.pno, start, length);
Signature · 1 line
2.35.6
Greg KH
maintainerQuoted 21 lines · Ashwin Dayanand Kamat
From: Min Li <[email protected]>
[ Upstream commit
6f64f866aa1ae6975c95d805ed51d7e9433a0016]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 callingbio_integrity_free.Cc <[email protected]>Signed-off-by Min Li <[email protected]>Reviewed-by Damien Le Moal <[email protected]>Reviewed-by Chaitanya Kulkarni <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Signed-off-by Jens Axboe <[email protected]>Signed-off-by Ashwin Dayanand Kamat <[email protected]>
Quoted 3 lines
--- block/ioctl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
Now queued up,t hanks.,
greg k-h