diff options
| author | Hannes Reinecke <hare@kernel.org> | 2024-05-24 12:46:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-07-11 12:51:22 +0200 |
| commit | 4734b5d72d4d9c5eff64841ee9492d26a76e5ab3 (patch) | |
| tree | 207b34f16f4194cb20f6bfb2e70bcd987b31b4ae | |
| parent | 946cbb3115fe96e8e5421ed6eb9d5f61e91e4da0 (diff) | |
| download | linux-4734b5d72d4d9c5eff64841ee9492d26a76e5ab3.tar.gz linux-4734b5d72d4d9c5eff64841ee9492d26a76e5ab3.tar.bz2 linux-4734b5d72d4d9c5eff64841ee9492d26a76e5ab3.zip | |
block: check for max_hw_sectors underflow
[ Upstream commit e993db2d6e5207f1ae061c2ac554ab1f714c741d ]
The logical block size need to be smaller than the max_hw_sector
setting, otherwise we can't even transfer a single LBA.
Signed-off-by: Hannes Reinecke <hare@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | block/blk-settings.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index 15319b217bf3..4bd7cbab4c24 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -104,6 +104,7 @@ static int blk_validate_zoned_limits(struct queue_limits *lim) static int blk_validate_limits(struct queue_limits *lim) { unsigned int max_hw_sectors; + unsigned int logical_block_sectors; /* * Unless otherwise specified, default to 512 byte logical blocks and a @@ -134,8 +135,11 @@ static int blk_validate_limits(struct queue_limits *lim) lim->max_hw_sectors = BLK_SAFE_MAX_SECTORS; if (WARN_ON_ONCE(lim->max_hw_sectors < PAGE_SECTORS)) return -EINVAL; + logical_block_sectors = lim->logical_block_size >> SECTOR_SHIFT; + if (WARN_ON_ONCE(logical_block_sectors > lim->max_hw_sectors)) + return -EINVAL; lim->max_hw_sectors = round_down(lim->max_hw_sectors, - lim->logical_block_size >> SECTOR_SHIFT); + logical_block_sectors); /* * The actual max_sectors value is a complex beast and also takes the @@ -153,7 +157,7 @@ static int blk_validate_limits(struct queue_limits *lim) lim->max_sectors = min(max_hw_sectors, BLK_DEF_MAX_SECTORS_CAP); } lim->max_sectors = round_down(lim->max_sectors, - lim->logical_block_size >> SECTOR_SHIFT); + logical_block_sectors); /* * Random default for the maximum number of segments. Driver should not |