Unverified Commit 5db3f4f3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3675 block mainline bugfix backport 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5SOE3TBNXWXZIGDZEZYWGWD5H6O3VCVG/ 
Li Nan (2):
  block: add check of 'minors' and 'first_minor' in device_add_disk()
  block: Set memalloc_noio to false on device_add_disk() error path

Min Li (1):
  block: add check that partition length needs to be aligned with block
    size


-- 
2.39.2
 
https://gitee.com/openeuler/kernel/issues/I8SCHN 
 
Link:https://gitee.com/openeuler/kernel/pulls/3675

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 3abdb96f fa7faa15

block/genhd.c

+4 −1
Original line number Diff line number Diff line
@@ -432,7 +432,9 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, 
				DISK_MAX_PARTS);

			disk->minors = DISK_MAX_PARTS;

		}

		if (disk->first_minor + disk->minors > MINORMASK + 1)

		if (disk->first_minor > MINORMASK ||

		    disk->minors > MINORMASK + 1 ||

		    disk->first_minor + disk->minors > MINORMASK + 1)

			goto out_exit_elevator;

	} else {

		if (WARN_ON(disk->minors))
@@ -542,6 +544,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, 
	kobject_put(disk->part0->bd_holder_dir);

out_del_block_link:

	sysfs_remove_link(block_depr, dev_name(ddev));

	pm_runtime_set_memalloc_noio(ddev, false);

out_device_del:

	device_del(ddev);

out_free_ext_minor:

block/ioctl.c

+7 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ static int blkpg_do_ioctl(struct block_device *bdev, 
{

	struct gendisk *disk = bdev->bd_disk;

	struct blkpg_partition p;

	long long start, length;

	sector_t start, length;



	if (disk->flags & GENHD_FL_NO_PART)

		return -EINVAL;
@@ -35,14 +35,17 @@ static int blkpg_do_ioctl(struct block_device *bdev, 
	if (op == BLKPG_DEL_PARTITION)

		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;

	length = p.length >> SECTOR_SHIFT;



	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(disk, p.pno, start, length);

	case BLKPG_RESIZE_PARTITION:

		return bdev_resize_partition(disk, p.pno, start, length);