diff mbox series

block: don't add or resize partition on the disk with GENHD_FL_NO_PART

Message ID 20230831075900.1725842-1-lilingfeng@huaweicloud.com (mailing list archive)
State New, archived
Headers show
Series block: don't add or resize partition on the disk with GENHD_FL_NO_PART | expand

Commit Message

Li Lingfeng Aug. 31, 2023, 7:59 a.m. UTC 
From: Li Lingfeng <lilingfeng3@huawei.com>

Commit a33df75c6328 ("block: use an xarray for disk->part_tbl") remove
disk_expand_part_tbl() in add_partition(), which means all kinds of
devices will support extended dynamic `dev_t`.
However, some devices with GENHD_FL_NO_PART are not expected to add or
resize partition.
Fix this by adding check of GENHD_FL_NO_PART before add or resize
partition.

Fixes: a33df75c6328 ("block: use an xarray for disk->part_tbl")
Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
---
 block/ioctl.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Christoph Hellwig Aug. 31, 2023, 12:42 p.m. UTC | #1 
Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>
Jens Axboe Aug. 31, 2023, 3:22 p.m. UTC | #2 
On Thu, 31 Aug 2023 15:59:00 +0800, Li Lingfeng wrote:
> Commit a33df75c6328 ("block: use an xarray for disk->part_tbl") remove
> disk_expand_part_tbl() in add_partition(), which means all kinds of
> devices will support extended dynamic `dev_t`.
> However, some devices with GENHD_FL_NO_PART are not expected to add or
> resize partition.
> Fix this by adding check of GENHD_FL_NO_PART before add or resize
> partition.
> 
> [...]

Applied, thanks!

[1/1] block: don't add or resize partition on the disk with GENHD_FL_NO_PART
      (no commit info)

Best regards,
diff mbox series

Patch

diff --git a/block/ioctl.c b/block/ioctl.c
index 648670ddb164..d5f5cd61efd7 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -20,6 +20,8 @@  static int blkpg_do_ioctl(struct block_device *bdev,
 	struct blkpg_partition p;
 	long long start, length;
 
+	if (disk->flags & GENHD_FL_NO_PART)
+		return -EINVAL;
 	if (!capable(CAP_SYS_ADMIN))
 		return -EACCES;
 	if (copy_from_user(&p, upart, sizeof(struct blkpg_partition)))