Skip to content

vmm: memory_manager: Fix bound checks for memory hotplug #6736

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
rbradford merged 1 commit into from
Sep 19, 2024
Merged

vmm: memory_manager: Fix bound checks for memory hotplug #6736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion virtio-devices/src/mem.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ impl VirtioMemConfig {
// in the usable region.
if addr % self.block_size != 0
|| size == 0
|| (addr < self.addr || addr + size >= self.addr + self.usable_region_size)
|| (addr < self.addr || addr + size > self.addr + self.usable_region_size)
{
return false;
}
Expand Down
6 changes: 5 additions & 1 deletion vmm/src/memory_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,7 +1675,11 @@ impl MemoryManager {

let start_addr = MemoryManager::start_addr(self.guest_memory.memory().last_addr(), true)?;

if start_addr.checked_add(size.try_into().unwrap()).unwrap() >= self.end_of_ram_area {
if start_addr
.checked_add((size - 1).try_into().unwrap())
.unwrap()
> self.end_of_ram_area
{
return Err(Error::InsufficientHotplugRam);
}

Expand Down