From 876559d2839a2464ea42debc53a4c605d337816d Mon Sep 17 00:00:00 2001 From: Liav A Date: Thu, 23 Dec 2021 21:11:18 +0200 Subject: [PATCH] Kernel: Change method name to clarify physical memory mmap validation --- Kernel/Devices/MemoryDevice.cpp | 2 +- Kernel/Memory/MemoryManager.cpp | 2 +- Kernel/Memory/MemoryManager.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Kernel/Devices/MemoryDevice.cpp b/Kernel/Devices/MemoryDevice.cpp index c728ccb185..c3b61bdc40 100644 --- a/Kernel/Devices/MemoryDevice.cpp +++ b/Kernel/Devices/MemoryDevice.cpp @@ -46,7 +46,7 @@ ErrorOr MemoryDevice::mmap(Process& process, OpenFileDescriptio auto viewed_address = PhysicalAddress(offset); dbgln("MemoryDevice: Trying to mmap physical memory at {} for range of {} bytes", viewed_address, range.size()); - if (!MM.is_allowed_to_mmap_to_userspace(viewed_address, range)) { + if (!MM.is_allowed_to_mmap_physical_memory_to_userspace(viewed_address, range)) { dbgln("MemoryDevice: Trying to mmap physical memory at {} for range of {} bytes failed due to violation of access", viewed_address, range.size()); return EINVAL; } diff --git a/Kernel/Memory/MemoryManager.cpp b/Kernel/Memory/MemoryManager.cpp index eacaf4cc20..3e14f503b7 100644 --- a/Kernel/Memory/MemoryManager.cpp +++ b/Kernel/Memory/MemoryManager.cpp @@ -209,7 +209,7 @@ UNMAP_AFTER_INIT void MemoryManager::register_reserved_ranges() m_reserved_memory_ranges.append(ContiguousReservedMemoryRange { range.start, m_physical_memory_ranges.last().start.get() + m_physical_memory_ranges.last().length - range.start.get() }); } -bool MemoryManager::is_allowed_to_mmap_to_userspace(PhysicalAddress start_address, VirtualRange const& range) const +bool MemoryManager::is_allowed_to_mmap_physical_memory_to_userspace(PhysicalAddress start_address, VirtualRange const& range) const { // Note: Guard against overflow in case someone tries to mmap on the edge of // the RAM diff --git a/Kernel/Memory/MemoryManager.h b/Kernel/Memory/MemoryManager.h index b23ec04ffb..761419c461 100644 --- a/Kernel/Memory/MemoryManager.h +++ b/Kernel/Memory/MemoryManager.h @@ -230,7 +230,7 @@ public: PageDirectory& kernel_page_directory() { return *m_kernel_page_directory; } Vector const& used_memory_ranges() { return m_used_memory_ranges; } - bool is_allowed_to_mmap_to_userspace(PhysicalAddress, VirtualRange const&) const; + bool is_allowed_to_mmap_physical_memory_to_userspace(PhysicalAddress, VirtualRange const&) const; PhysicalPageEntry& get_physical_page_entry(PhysicalAddress); PhysicalAddress get_physical_address(PhysicalPage const&);