summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLi Nan <linan122@huawei.com>2023-12-19 15:59:42 +0800
committerJens Axboe <axboe@kernel.dk>2023-12-19 08:23:12 -0700
commit4c434392c4777881d01beada6701eff8c76b43fe (patch)
treef23457479d752a1591637c20885909997931742e /block
parent6c9b97085c473e380e57cf33c95d2c74444b2a5d (diff)
downloadlinux-stable-4c434392c4777881d01beada6701eff8c76b43fe.tar.gz
linux-stable-4c434392c4777881d01beada6701eff8c76b43fe.tar.bz2
linux-stable-4c434392c4777881d01beada6701eff8c76b43fe.zip
block: add check of 'minors' and 'first_minor' in device_add_disk()
'first_minor' represents the starting minor number of disks, and 'minors' represents the number of partitions in the device. Neither of them can be greater than MINORMASK + 1. Commit e338924bd05d ("block: check minor range in device_add_disk()") only added the check of 'first_minor + minors'. However, their sum might be less than MINORMASK but their values are wrong. Complete the checks now. Fixes: e338924bd05d ("block: check minor range in device_add_disk()") Signed-off-by: Li Nan <linan122@huawei.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20231219075942.840255-1-linan666@huaweicloud.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/genhd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c
index 13db3a7943d8..d74fb5b4ae68 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -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))