Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Fix MemoryBackedRegion cloning for non page aligned size

This commit is contained in:
Bananymous 2024-09-04 21:14:26 +03:00
parent c4dadd27ac
commit 1138ec77ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/kernel/Memory/MemoryBackedRegion.cpp
View File

@ -67,14 +67,16 @@ namespace Kernel
{ {
ASSERT(&PageTable::current() == &m_page_table); ASSERT(&PageTable::current() == &m_page_table);
auto result = TRY(MemoryBackedRegion::create(new_page_table, m_size, { .start = m_vaddr, .end = m_vaddr + m_size }, m_type, m_flags)); const size_t aligned_size = (m_size + PAGE_SIZE - 1) & PAGE_ADDR_MASK;
auto result = TRY(MemoryBackedRegion::create(new_page_table, m_size, { .start = m_vaddr, .end = m_vaddr + aligned_size }, m_type, m_flags));
for (size_t offset = 0; offset < m_size; offset += PAGE_SIZE) for (size_t offset = 0; offset < m_size; offset += PAGE_SIZE)
{ {
paddr_t paddr = m_page_table.physical_address_of(m_vaddr + offset); paddr_t paddr = m_page_table.physical_address_of(m_vaddr + offset);
if (paddr == 0) if (paddr == 0)
continue; continue;
TRY(result->copy_data_to_region(offset, (const uint8_t*)(m_vaddr + offset), PAGE_SIZE)); const size_t to_copy = BAN::Math::min<size_t>(PAGE_SIZE, m_size - offset);
TRY(result->copy_data_to_region(offset, (const uint8_t*)(m_vaddr + offset), to_copy));
} }
return BAN::UniqPtr<MemoryRegion>(BAN::move(result)); return BAN::UniqPtr<MemoryRegion>(BAN::move(result));