summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorCaleb Sander Mateos <csander@purestorage.com>2025-12-16 22:34:36 -0700
committerJens Axboe <axboe@kernel.dk>2025-12-18 09:51:49 -0700
commitaf65faf34f6e9919bdd2912770d25d2a73cbcc7c (patch)
treee61c63a111711e7ec73b2ed2fdc73916246753e6 /block
parentccb8a3c08adf8121e2afb8e704f007ce99324d79 (diff)
block: validate interval_exp integrity limit
Various code assumes that the integrity interval is at least 1 sector and evenly divides the logical block size. Add these checks to blk_validate_integrity_limits(). This guards against block drivers that report invalid interval_exp values. Signed-off-by: Caleb Sander Mateos <csander@purestorage.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-settings.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c
index d138abc973bb..a9e65dc090da 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -193,8 +193,13 @@ static int blk_validate_integrity_limits(struct queue_limits *lim)
break;
}
- if (!bi->interval_exp)
+ if (!bi->interval_exp) {
bi->interval_exp = ilog2(lim->logical_block_size);
+ } else if (bi->interval_exp < SECTOR_SHIFT ||
+ bi->interval_exp > ilog2(lim->logical_block_size)) {
+ pr_warn("invalid interval_exp %u\n", bi->interval_exp);
+ return -EINVAL;
+ }
/*
* The PI generation / validation helpers do not expect intervals to