diff options
| author | Andrey Vagin <avagin@openvz.org> | 2010-07-20 15:23:14 -0700 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-07-23 15:08:12 +0200 |
| commit | 2b08de0073a5697cf84d6f448d6dbc6cf02fc6b5 (patch) | |
| tree | 79188eeb1dc9e5a269d999c8afe6f01292c05682 | |
| parent | 22b8f15c2f7130bb0386f548428df2ffd4e81903 (diff) | |
| download | linux-stable-2b08de0073a5697cf84d6f448d6dbc6cf02fc6b5.tar.gz linux-stable-2b08de0073a5697cf84d6f448d6dbc6cf02fc6b5.tar.bz2 linux-stable-2b08de0073a5697cf84d6f448d6dbc6cf02fc6b5.zip | |
posix_timer: Move copy_to_user(created_timer_id) down in timer_create()
According to Oleg Nesterov:
We can move copy_to_user(created_timer_id) down after
"if (timer_event_spec)" block too. (but before CLOCK_DISPATCH(),
of course).
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Pavel Emelyanov <xemul@openvz.org>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | kernel/posix-timers.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index ad723420acc3..9ca4973f736d 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -560,11 +560,6 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock, new_timer->it_clock = which_clock; new_timer->it_overrun = -1; - if (copy_to_user(created_timer_id, - &new_timer_id, sizeof (new_timer_id))) { - error = -EFAULT; - goto out; - } if (timer_event_spec) { if (copy_from_user(&event, timer_event_spec, sizeof (event))) { error = -EFAULT; @@ -590,6 +585,12 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock, new_timer->sigq->info.si_tid = new_timer->it_id; new_timer->sigq->info.si_code = SI_TIMER; + if (copy_to_user(created_timer_id, + &new_timer_id, sizeof (new_timer_id))) { + error = -EFAULT; + goto out; + } + error = CLOCK_DISPATCH(which_clock, timer_create, (new_timer)); if (error) goto out; |