* Re: [PATCH v3] block: add capacity validation in bdev_add_partition()
2023-06-16 17:19 ` [PATCH v3] block: add capacity validation in bdev_add_partition() min.li
@ 2023-06-16 11:52 ` Damien Le Moal
0 siblings, 0 replies; 2+ messages in thread
From: Damien Le Moal @ 2023-06-16 11:52 UTC (permalink / raw
To: min.li, axboe, willy, hch, gregkh, wsa, vkoul; +Cc: linux-block, linux-kernel
On 6/17/23 02:19, min.li wrote:
> 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.
>
> Signed-off-by: min.li <min15.li@samsung.com>
I am guessing this should be:
Signed-off-by: Min Li <min15.li@samsung.com>
No ? The signed-off-by tag, and any other tag, must have your full name
correctly written.
> Reviewed-by: Christoph Hellwig <hch@lst.de>
>
> ---
> Changes from v1:
>
> - Check for overflows of the start + length value.
> - Place the capacity check at the beginning of the function.
>
> Changes from v2:
>
> - Place the assignment on the first line and merge the two lines into one.
> - Modify the singed name.
> ---
> block/partitions/core.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/block/partitions/core.c b/block/partitions/core.c
> index 49e0496ff23c..b511f88bf558 100644
> --- a/block/partitions/core.c
> +++ b/block/partitions/core.c
> @@ -436,10 +436,21 @@ static bool partition_overlaps(struct gendisk *disk, sector_t start,
> int bdev_add_partition(struct gendisk *disk, int partno, sector_t start,
> sector_t length)
> {
> + sector_t capacity = get_capacity(disk), end;
> struct block_device *part;
> int ret;
>
> 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;
--
Damien Le Moal
Western Digital Research
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH v3] block: add capacity validation in bdev_add_partition()
[not found] <CGME20230616092054epcas5p340e977377808d2df7210dc4a7d6c1d8e@epcas5p3.samsung.com>
@ 2023-06-16 17:19 ` min.li
2023-06-16 11:52 ` Damien Le Moal
0 siblings, 1 reply; 2+ messages in thread
From: min.li @ 2023-06-16 17:19 UTC (permalink / raw
To: axboe, willy, hch, dlemoal, gregkh, wsa, vkoul
Cc: linux-block, linux-kernel, min.li
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.
Signed-off-by: min.li <min15.li@samsung.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
Changes from v1:
- Check for overflows of the start + length value.
- Place the capacity check at the beginning of the function.
Changes from v2:
- Place the assignment on the first line and merge the two lines into one.
- Modify the singed name.
---
block/partitions/core.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/block/partitions/core.c b/block/partitions/core.c
index 49e0496ff23c..b511f88bf558 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -436,10 +436,21 @@ static bool partition_overlaps(struct gendisk *disk, sector_t start,
int bdev_add_partition(struct gendisk *disk, int partno, sector_t start,
sector_t length)
{
+ sector_t capacity = get_capacity(disk), end;
struct block_device *part;
int ret;
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-16 11:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CGME20230616092054epcas5p340e977377808d2df7210dc4a7d6c1d8e@epcas5p3.samsung.com>
2023-06-16 17:19 ` [PATCH v3] block: add capacity validation in bdev_add_partition() min.li
2023-06-16 11:52 ` Damien Le Moal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).