apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

kernel/mmap: Fix some parameters

Browse Source
This commit is contained in:
apio 2023-08-03 09:26:21 +02:00
parent b447c1a261
commit b5d146b492
Signed by: apio
GPG Key ID: B8A7D06E42258954
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/src/sys/mmap.cpp
View File

@ -46,7 +46,7 @@ Result<u64> sys_mmap(Registers*, SyscallArgs args)
else else
{ {
if ((params.prot & PROT_WRITE) && !(description->flags & O_WRONLY)) return err(EACCES); if ((params.prot & PROT_WRITE) && !(description->flags & O_WRONLY)) return err(EACCES);
shmid = TRY(description->inode->query_shared_memory(params.offset, params.len)); shmid = TRY(description->inode->query_shared_memory(params.offset, params.len / ARCH_PAGE_SIZE));
} }
shmem = g_shared_memory_map.try_get_ref(shmid); shmem = g_shared_memory_map.try_get_ref(shmid);
shmem->refs++; shmem->refs++;
@ -72,10 +72,10 @@ Result<u64> sys_mmap(Registers*, SyscallArgs args)
if (params.prot == PROT_NONE) mmu_flags = MMU::NoExecute; if (params.prot == PROT_NONE) mmu_flags = MMU::NoExecute;
#ifdef MMAP_DEBUG #ifdef MMAP_DEBUG
kdbgln("mmap: mapping memory at %#lx, size=%zu", address, len); kdbgln("mmap: mapping memory at %#lx, size=%zu", address, params.len);
#endif #endif
if (shmem) { TRY(shmem->map(address, mmu_flags, params.offset, get_blocks_from_size(params.len, ARCH_PAGE_SIZE))); } if (shmem) { TRY(shmem->map(address, mmu_flags, params.offset, params.len / ARCH_PAGE_SIZE)); }
else else
{ {
TRY(MemoryManager::alloc_at_zeroed(address, get_blocks_from_size(params.len, ARCH_PAGE_SIZE), mmu_flags)); TRY(MemoryManager::alloc_at_zeroed(address, get_blocks_from_size(params.len, ARCH_PAGE_SIZE), mmu_flags));