[PATCH 2/3] posix_timer: fix error path in timer_create
in [Kernel]
|
Prev: [PATCH] KEYS: Return more accurate error codes
Next: [PATCH 3/3] posix_timer: move copy_to_user(created_timer_id) down in timer_create
From: Andrey Vagin on 17 May 2010 09:50 move CLOCK_DISPATCH(which_clock, timer_create, (new_timer)) after all possible EFAULT errors. *_timer_create may allocate/get resources. (for example posix_cpu_timer_create does get_task_struct) Signed-off-by: Andrey Vagin <avagin(a)openvz.org> --- kernel/posix-timers.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 5555e7c..8393624 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -555,14 +555,6 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock, goto out; } - it_id_set = IT_ID_SET; - new_timer->it_id = (timer_t) new_timer_id; - new_timer->it_clock = which_clock; - new_timer->it_overrun = -1; - error = CLOCK_DISPATCH(which_clock, timer_create, (new_timer)); - if (error) - goto out; - if (copy_to_user(created_timer_id, &new_timer_id, sizeof (new_timer_id))) { error = -EFAULT; @@ -593,6 +585,14 @@ 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; + it_id_set = IT_ID_SET; + new_timer->it_id = (timer_t) new_timer_id; + new_timer->it_clock = which_clock; + new_timer->it_overrun = -1; + error = CLOCK_DISPATCH(which_clock, timer_create, (new_timer)); + if (error) + goto out; + spin_lock_irq(¤t->sighand->siglock); new_timer->it_signal = current->signal; list_add(&new_timer->list, ¤t->signal->posix_timers); -- 1.6.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |