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

brk(): return old address if memory allocation fails

Browse Source
This commit is contained in:
Balazs Gerofi
2017-05-26 15:41:38 +09:00
parent e306b1e838
commit c0cabc2d83
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/syscall.c
View File

@ -1588,6 +1588,7 @@ SYSCALL_DECLARE(brk)
struct vm_regions *region = &cpu_local_var(current)->vm->region; struct vm_regions *region = &cpu_local_var(current)->vm->region;
unsigned long r; unsigned long r;
unsigned long vrflag; unsigned long vrflag;
unsigned long old_brk_end_allocated = 0;
dkprintf("SC(%d)[sys_brk] brk_start=%lx,end=%lx\n", dkprintf("SC(%d)[sys_brk] brk_start=%lx,end=%lx\n",
ihk_mc_get_processor_id(), region->brk_start, region->brk_end); ihk_mc_get_processor_id(), region->brk_start, region->brk_end);
@ -1616,6 +1617,7 @@ SYSCALL_DECLARE(brk)
/* Try to extend memory region */ /* Try to extend memory region */
vrflag = VR_PROT_READ | VR_PROT_WRITE; vrflag = VR_PROT_READ | VR_PROT_WRITE;
vrflag |= VRFLAG_PROT_TO_MAXPROT(vrflag); vrflag |= VRFLAG_PROT_TO_MAXPROT(vrflag);
old_brk_end_allocated = region->brk_end_allocated;
ihk_mc_spinlock_lock_noirq(&cpu_local_var(current)->vm->memory_range_lock); ihk_mc_spinlock_lock_noirq(&cpu_local_var(current)->vm->memory_range_lock);
region->brk_end_allocated = region->brk_end_allocated =
extend_process_region(cpu_local_var(current)->vm, extend_process_region(cpu_local_var(current)->vm,
@ -1624,6 +1626,11 @@ SYSCALL_DECLARE(brk)
dkprintf("SC(%d)[sys_brk] brk_end set to %lx\n", dkprintf("SC(%d)[sys_brk] brk_end set to %lx\n",
ihk_mc_get_processor_id(), region->brk_end); ihk_mc_get_processor_id(), region->brk_end);
if (old_brk_end_allocated == region->brk_end_allocated) {
r = old_brk_end_allocated;
goto out;
}
region->brk_end = address; region->brk_end = address;
r = region->brk_end; r = region->brk_end;