Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the somehow newly introduced warnings

Browse Source
This commit is contained in:
David van Moolenbroek
2010-02-14 18:39:47 +00:00
parent ff835e0e35
commit e306663455
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
kernel/arch/i386/exception.c
View File

@@ -147,26 +147,26 @@ PUBLIC void exception_handler(int is_nested, struct exception_frame * frame)
* them out quickly if the traps are not nested
*/
if (is_nested) {
/*
* if a problem occured while copying a message from userspace because
* of a wrong pointer supplied by userland, handle it the only way we
* can handle it ...
*/
if (((void*)frame->eip >= copy_msg_to_user &&
(void*)frame->eip <= __copy_msg_to_user_end) ||
((void*)frame->eip >= copy_msg_from_user &&
(void*)frame->eip <= __copy_msg_from_user_end)) {
switch(frame->vector) {
/* these error are expected */
case PAGE_FAULT_VECTOR:
case PROTECTION_VECTOR:
frame->eip = (reg_t) __user_copy_msg_pointer_failure;
return;
default:
minix_panic("Copy involving a user pointer "
"failed unexpectedly!", NO_NUM);
}
}
/*
* if a problem occured while copying a message from userspace because
* of a wrong pointer supplied by userland, handle it the only way we
* can handle it ...
*/
if (((void*)frame->eip >= (void*)copy_msg_to_user &&
(void*)frame->eip <= (void*)__copy_msg_to_user_end) ||
((void*)frame->eip >= (void*)copy_msg_from_user &&
(void*)frame->eip <= (void*)__copy_msg_from_user_end)) {
switch(frame->vector) {
/* these error are expected */
case PAGE_FAULT_VECTOR:
case PROTECTION_VECTOR:
frame->eip = (reg_t) __user_copy_msg_pointer_failure;
return;
default:
minix_panic("Copy involving a user pointer "
"failed unexpectedly!", NO_NUM);
}
}
}
if(frame->vector == PAGE_FAULT_VECTOR) {