JehanneOS/jehanne
JehanneOS
/
jehanne
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

kernel: removed unreachable code in fault (CID: 155701) 

If the user process does not have a segment holding the required addr
the fault function return early.
This commit is contained in:
Giacomo Tesio 2017-08-15 01:07:44 +02:00
parent 55a8a84d8d
commit e0e45fba5a
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/src/kern/port/fault.c
View File

@ -45,19 +45,13 @@ fault(uintptr_t addr, uintptr_t pc, int ftype)
if(up->procctl == Proc_exitbig)
pexit("out of memory", 1);
if(s != nil){
pprint("%s fault fail %s(%c%c%c) pid %d (%s) addr 0x%p pc 0x%p\n",
fault_types[ftype],
segment_types[s->type],
(s->permissions & SgRead) != 0 ? 'r' : '-',
(s->permissions & SgWrite) != 0 ? 'w' : '-',
(s->permissions & SgExecute) != 0 ? 'x' : '-',
up->pid, up->text, faddr, pc);
} else {
pprint("%s fault fail, no segment, pid %d (%s) addr 0x%p pc 0x%p\n",
fault_types[ftype],
up->pid, up->text, faddr, pc);
}
pprint("%s fault fail %s(%c%c%c) pid %d (%s) addr 0x%p pc 0x%p\n",
fault_types[ftype],
segment_types[s->type],
(s->permissions & SgRead) != 0 ? 'r' : '-',
(s->permissions & SgWrite) != 0 ? 'w' : '-',
(s->permissions & SgExecute) != 0 ? 'x' : '-',
up->pid, up->text, faddr, pc);
splhi();
up->psstate = sps;
return -1;