From a430062b1c0ea4c3cf1242da5b0f4b61642a26bb Mon Sep 17 00:00:00 2001
From: Andrey Vagin <avagin@openvz.org>
Date: Tue, 20 Jul 2010 15:23:14 -0700
Subject: [PATCH] --- yaml --- r: 206136 b: refs/heads/master c:
 2b08de0073a5697cf84d6f448d6dbc6cf02fc6b5 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/kernel/posix-timers.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 67e5250b786d..520c84d25714 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22b8f15c2f7130bb0386f548428df2ffd4e81903
+refs/heads/master: 2b08de0073a5697cf84d6f448d6dbc6cf02fc6b5
diff --git a/trunk/kernel/posix-timers.c b/trunk/kernel/posix-timers.c
index ad723420acc3..9ca4973f736d 100644
--- a/trunk/kernel/posix-timers.c
+++ b/trunk/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;