sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: fix assert condition after a caught in-kernel pagefault

Browse source
This commit is contained in:
Ben Gras 2010-06-09 10:59:57 +00:00
parent a0eaaa5c9f
commit a6e357da22
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kernel/arch/i386/memory.c
View file

@ -832,7 +832,7 @@ int vmcheck; /* if nonzero, can return VMSUSPEND */
if((r=lin_lin_copy(procs[_SRC_], phys_addr[_SRC_], if((r=lin_lin_copy(procs[_SRC_], phys_addr[_SRC_],
procs[_DST_], phys_addr[_DST_], bytes)) != OK) { procs[_DST_], phys_addr[_DST_], bytes)) != OK) {
struct proc *target; struct proc *target = NULL;
phys_bytes lin; phys_bytes lin;
if(r != EFAULT_SRC && r != EFAULT_DST) if(r != EFAULT_SRC && r != EFAULT_DST)
panic("lin_lin_copy failed: %d", r); panic("lin_lin_copy failed: %d", r);
@ -840,8 +840,6 @@ int vmcheck; /* if nonzero, can return VMSUSPEND */
return r; return r;
} }
assert(procs[_SRC_] && procs[_DST_]);
if(r == EFAULT_SRC) { if(r == EFAULT_SRC) {
lin = phys_addr[_SRC_]; lin = phys_addr[_SRC_];
target = procs[_SRC_]; target = procs[_SRC_];
@ -852,6 +850,9 @@ int vmcheck; /* if nonzero, can return VMSUSPEND */
panic("r strange: %d", r); panic("r strange: %d", r);
} }
assert(caller);
assert(target);
vm_suspend(caller, target, lin, bytes, VMSTYPE_KERNELCALL); vm_suspend(caller, target, lin, bytes, VMSTYPE_KERNELCALL);
return VMSUSPEND; return VMSUSPEND;
} }