diff mbox series

block: limit disk max sectors to (LLONG_MAX >> 9)

Message ID 20250115092648.1104452-1-ming.lei@redhat.com (mailing list archive)
State New
Headers show
Series block: limit disk max sectors to (LLONG_MAX >> 9) | expand

Commit Message

Ming Lei Jan. 15, 2025, 9:26 a.m. UTC 
Kernel `loff_t` is defined as `long long int`, so we can't support disk
which size is > LLONG_MAX.

There are many virtual block drivers, and hardware may report bad capacity
too, so limit max sectors to (LLONG_MAX >> 9) for avoiding potential
trouble.

Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
 block/blk.h   |  2 ++
 block/genhd.c | 10 ++++++++++
 2 files changed, 12 insertions(+)

Comments

Jens Axboe Jan. 16, 2025, 2:13 p.m. UTC | #1 
On Wed, 15 Jan 2025 17:26:48 +0800, Ming Lei wrote:
> Kernel `loff_t` is defined as `long long int`, so we can't support disk
> which size is > LLONG_MAX.
> 
> There are many virtual block drivers, and hardware may report bad capacity
> too, so limit max sectors to (LLONG_MAX >> 9) for avoiding potential
> trouble.
> 
> [...]

Applied, thanks!

[1/1] block: limit disk max sectors to (LLONG_MAX >> 9)
      commit: 3d9a9e9a77c5ebecda43b514f2b9659644b904d0

Best regards,
diff mbox series

Patch

diff --git a/block/blk.h b/block/blk.h
index 4904b86d5fec..90fa5f28ccab 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -13,6 +13,8 @@ 
 
 struct elevator_type;
 
+#define	BLK_DEV_MAX_SECTORS	(LLONG_MAX >> 9)
+
 /* Max future timer expiry for timeouts */
 #define BLK_MAX_TIMEOUT		(5 * HZ)
 
diff --git a/block/genhd.c b/block/genhd.c
index befb7a516bcf..e9375e20d866 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -58,6 +58,13 @@  static DEFINE_IDA(ext_devt_ida);
 
 void set_capacity(struct gendisk *disk, sector_t sectors)
 {
+	if (sectors > BLK_DEV_MAX_SECTORS) {
+		pr_warn_once("%s: truncate capacity from %lld to %lld\n",
+				disk->disk_name, sectors,
+				BLK_DEV_MAX_SECTORS);
+		sectors = BLK_DEV_MAX_SECTORS;
+	}
+
 	bdev_set_nr_sectors(disk->part0, sectors);
 }
 EXPORT_SYMBOL(set_capacity);
@@ -400,6 +407,9 @@  int __must_check add_disk_fwnode(struct device *parent, struct gendisk *disk,
 	struct device *ddev = disk_to_dev(disk);
 	int ret;
 
+	if (WARN_ON_ONCE(bdev_nr_sectors(disk->part0) > BLK_DEV_MAX_SECTORS))
+		return -EINVAL;
+
 	if (queue_is_mq(disk->queue)) {
 		/*
 		 * ->submit_bio and ->poll_bio are bypassed for blk-mq drivers.