Skip to content

[VDO-6034] Add extra zone count validations #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lorelei-sakai merged 2 commits into from
Feb 11, 2026
Merged

[VDO-6034] Add extra zone count validations #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5a993c
dm vdo indexer: validate saved zone count
lorelei-sakai Feb 3, 2026
7d63ba8
dm vdo slab-depot: validate old zone count on load
lorelei-sakai Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions drivers/md/dm-vdo/indexer/index-layout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1445,6 +1445,9 @@ static int __must_check reconstruct_index_save(struct index_save_layout *isl,
u64 last_block = next_block + isl->index_save.block_count;

isl->zone_count = table->header.region_count - 3;
if (isl->zone_count > MAX_ZONES)
return vdo_log_error_strerror(UDS_CORRUPT_DATA,
"invalid zone count");

last_region = &table->regions[table->header.region_count - 1];
if (last_region->kind == RL_KIND_EMPTY) {
Expand Down
4 changes: 4 additions & 0 deletions drivers/md/dm-vdo/slab-depot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4262,6 +4262,10 @@ int vdo_decode_slab_depot(struct slab_depot_state_2_0 state, struct vdo *vdo,
}
slab_size_shift = ilog2(slab_size);

if (state.zone_count > MAX_VDO_PHYSICAL_ZONES)
return vdo_log_error_strerror(UDS_CORRUPT_DATA,
"invalid zone count");

result = vdo_allocate_extended(struct slab_depot,
vdo->thread_config.physical_zone_count,
struct block_allocator, __func__, &depot);
Expand Down