From 832cb40da9b188342971dab2b4caef919b96687d Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 25 Jan 2025 16:15:42 -0500 Subject: [PATCH] kernel/vm: Add PAGE_ALIGN in size computation in VMCache::Merge(). The same is already done in SetMinimalCommitment. --- src/system/kernel/vm/VMAnonymousCache.cpp | 2 +- src/system/kernel/vm/VMAnonymousNoSwapCache.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/kernel/vm/VMAnonymousCache.cpp b/src/system/kernel/vm/VMAnonymousCache.cpp index 9b358abc58..b7874246d4 100644 --- a/src/system/kernel/vm/VMAnonymousCache.cpp +++ b/src/system/kernel/vm/VMAnonymousCache.cpp @@ -1036,7 +1036,7 @@ VMAnonymousCache::Merge(VMCache* _source) committed_size += source->committed_size; source->committed_size = 0; - off_t actualSize = virtual_end - virtual_base; + off_t actualSize = PAGE_ALIGN(virtual_end - virtual_base); if (committed_size > actualSize) _Commit(actualSize, VM_PRIORITY_USER); diff --git a/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp b/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp index 3d31a3d21e..4ad43e28c6 100644 --- a/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp +++ b/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp @@ -197,7 +197,7 @@ VMAnonymousNoSwapCache::Merge(VMCache* _source) committed_size += source->committed_size; source->committed_size = 0; - off_t actualSize = virtual_end - virtual_base; + off_t actualSize = PAGE_ALIGN(virtual_end - virtual_base); if (committed_size > actualSize) { vm_unreserve_memory(committed_size - actualSize); committed_size = actualSize;