From 2ddc52e1a4e348c8be7832ec90c7f874f07ff2f7 Mon Sep 17 00:00:00 2001 From: Masamichi Takagi Date: Fri, 13 Oct 2017 04:53:23 +0900 Subject: [PATCH] setitimer(): Fix error handling of copy_from_user() This fixes POSTK_TEMP_FIX_40 (POSTK_DEBUG_TEMP_FIX_40) --- kernel/syscall.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/kernel/syscall.c b/kernel/syscall.c index 16d81989..b4c5735c 100644 --- a/kernel/syscall.c +++ b/kernel/syscall.c @@ -6863,12 +6863,9 @@ SYSCALL_DECLARE(setitimer) if(!new){ 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; -#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_nsec = 0; if(thread->itimer_virtual.it_value.tv_sec == 0 && @@ -6889,12 +6886,9 @@ SYSCALL_DECLARE(setitimer) if(!new){ 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; -#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_nsec = 0; if(thread->itimer_prof.it_value.tv_sec == 0 &&