gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmap(): fault in memory only up to file size for populated file mappings

Browse Source
This commit is contained in:
Balazs Gerofi
2016-12-27 16:33:24 +09:00
parent a6d8125fd7
commit 4e5ec74ffe
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/syscall.c
View File

@ -1135,6 +1135,7 @@ do_mmap(const intptr_t addr0, const size_t len0, const int prot,
struct vm_regions *region = &thread->vm->region; struct vm_regions *region = &thread->vm->region;
intptr_t addr = addr0; intptr_t addr = addr0;
size_t len = len0; size_t len = len0;
size_t populate_len;
off_t off; off_t off;
int error; int error;
intptr_t npages; intptr_t npages;
@ -1363,10 +1364,13 @@ do_mmap(const intptr_t addr0, const size_t len0, const int prot,
goto out; goto out;
} }
populate_len = len;
memobj_lock(memobj); memobj_lock(memobj);
if (memobj->status == MEMOBJ_TO_BE_PREFETCHED) { if (memobj->status == MEMOBJ_TO_BE_PREFETCHED) {
memobj->status = MEMOBJ_READY; memobj->status = MEMOBJ_READY;
populated_mapping = 1; populated_mapping = 1;
populate_len = memobj->size;
} }
memobj_unlock(memobj); memobj_unlock(memobj);
@ -1382,7 +1386,9 @@ out:
ihk_mc_spinlock_unlock_noirq(&thread->vm->memory_range_lock); ihk_mc_spinlock_unlock_noirq(&thread->vm->memory_range_lock);
if (!error && populated_mapping && !((vrflags & VR_PROT_MASK) == VR_PROT_NONE)) { if (!error && populated_mapping && !((vrflags & VR_PROT_MASK) == VR_PROT_NONE)) {
error = populate_process_memory(thread->vm, (void *)addr, len); error = populate_process_memory(thread->vm,
(void *)addr, populate_len);
if (error) { if (error) {
ekprintf("%s: WARNING: populate_process_memory(): " ekprintf("%s: WARNING: populate_process_memory(): "
"vm: %p, addr: %p, len: %d (flags: %s%s) failed %d\n", "vm: %p, addr: %p, len: %d (flags: %s%s) failed %d\n",