diff options
| author | Li Lingfeng <lilingfeng3@huawei.com> | 2023-08-31 15:59:00 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-09-13 09:53:54 +0200 |
| commit | f42cee0051db25ab6d0da4348f00729f22b5493f (patch) | |
| tree | 11cf08b8e10c2d826acd9ec5e6d87cade42eebad | |
| parent | ccd700dccea23fb837470902466d52b010eed19c (diff) | |
| download | linux-stable-f42cee0051db25ab6d0da4348f00729f22b5493f.tar.gz linux-stable-f42cee0051db25ab6d0da4348f00729f22b5493f.tar.bz2 linux-stable-f42cee0051db25ab6d0da4348f00729f22b5493f.zip | |
block: don't add or resize partition on the disk with GENHD_FL_NO_PART
commit 1a721de8489fa559ff4471f73c58bb74ac5580d3 upstream.
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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230831075900.1725842-1-lilingfeng@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | block/ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index 3be11941fb2d..9fcddd847937 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))) |