Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "min15.li" <min15.li@samsung.com>
To:     axboe@kernel.dk, willy@infradead.org, hch@lst.de,
        dlemoal@kernel.org, gregkh@linuxfoundation.org, wsa@kernel.org,
        vkoul@kernel.org
Cc:     linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
        "min15.li" <min15.li@samsung.com>
Subject: [PATCH v2] block: add capacity validation in bdev_add_partition()
Date:   Fri, 16 Jun 2023 11:05:57 +0000
Message-Id: <20230616110557.12106-1-min15.li@samsung.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="utf-8"
CMS-TYPE: 105P
DLP-Filter: Pass
References: <CGME20230616030739epcas5p31e705be33bf080f988702d42534ad32f@epcas5p3.samsung.com>
Precedence: bulk

In the function bdev_add_partition(),there is no check that the start
and end sectors exceed the size of the disk before calling add_partition.
When we call the block's ioctl interface directly to add a partition,
and the capacity of the disk is set to 0 by driver,the command will
continue to execute.
v1->v2: check for overflows of the start + length value and put
the capacity check at the beginning of the function.

Signed-off-by: min15.li <min15.li@samsung.com>
---
 block/partitions/core.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/block/partitions/core.c b/block/partitions/core.c
index 49e0496ff23c..3546b43d5124 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -438,8 +438,20 @@ int bdev_add_partition(struct gendisk *disk, int partno, sector_t start,
 {
 	struct block_device *part;
 	int ret;
+	sector_t end;
+	sector_t capacity = get_capacity(disk);
 
 	mutex_lock(&disk->open_mutex);
+	if (check_add_overflow(start, length, &end)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	if (start >= capacity || end > capacity) {
+		ret = -EINVAL;
+		goto out;
+	}
+
 	if (!disk_live(disk)) {
 		ret = -ENXIO;
 		goto out;
-- 
2.34.1