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

setitimer(): Fix error handling of copy_from_user()

Browse Source 
This fixes POSTK_TEMP_FIX_40 (POSTK_DEBUG_TEMP_FIX_40)
This commit is contained in:
Masamichi Takagi
2017-10-13 04:53:23 +09:00
parent 3c93958c48
commit 2ddc52e1a4
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/syscall.c
View File

@@ -6863,12 +6863,9 @@ SYSCALL_DECLARE(setitimer)
if(!new){ if(!new){
return 0; return 0;
} }
#ifdef POSTK_DEBUG_TEMP_FIX_40 /* setitimer copy_from_user() error return fix. */ if (copy_from_user(&thread->itimer_virtual, new, sizeof(struct itimerval))) {
if(copy_from_user(&thread->itimer_virtual, new, sizeof(struct itimerval)))
return -EFAULT; return -EFAULT;
#else /* POSTK_DEBUG_TEMP_FIX_40 */ }
if(copy_from_user(&thread->itimer_virtual, new, sizeof(struct itimerval)))
#endif /* POSTK_DEBUG_TEMP_FIX_40 */
thread->itimer_virtual_value.tv_sec = 0; thread->itimer_virtual_value.tv_sec = 0;
thread->itimer_virtual_value.tv_nsec = 0; thread->itimer_virtual_value.tv_nsec = 0;
if(thread->itimer_virtual.it_value.tv_sec == 0 && if(thread->itimer_virtual.it_value.tv_sec == 0 &&
@@ -6889,12 +6886,9 @@ SYSCALL_DECLARE(setitimer)
if(!new){ if(!new){
return 0; return 0;
} }
#ifdef POSTK_DEBUG_TEMP_FIX_40 /* setitimer copy_from_user() error return fix. */ if (copy_from_user(&thread->itimer_prof, new, sizeof(struct itimerval))) {
if(copy_from_user(&thread->itimer_prof, new, sizeof(struct itimerval)))
return -EFAULT; return -EFAULT;
#else /* POSTK_DEBUG_TEMP_FIX_40 */ }
if(copy_from_user(&thread->itimer_prof, new, sizeof(struct itimerval)))
#endif /* POSTK_DEBUG_TEMP_FIX_40 */
thread->itimer_prof_value.tv_sec = 0; thread->itimer_prof_value.tv_sec = 0;
thread->itimer_prof_value.tv_nsec = 0; thread->itimer_prof_value.tv_nsec = 0;
if(thread->itimer_prof.it_value.tv_sec == 0 && if(thread->itimer_prof.it_value.tv_sec == 0 &&