Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Andrey Vagin and committed by
Thomas Gleixner
2b08de00 22b8f15c

+6 -5
+6 -5
kernel/posix-timers.c
··· 560 560 new_timer->it_clock = which_clock; 561 561 new_timer->it_overrun = -1; 562 562 563 - if (copy_to_user(created_timer_id, 564 - &new_timer_id, sizeof (new_timer_id))) { 565 - error = -EFAULT; 566 - goto out; 567 - } 568 563 if (timer_event_spec) { 569 564 if (copy_from_user(&event, timer_event_spec, sizeof (event))) { 570 565 error = -EFAULT; ··· 584 589 new_timer->sigq->info.si_value = event.sigev_value; 585 590 new_timer->sigq->info.si_tid = new_timer->it_id; 586 591 new_timer->sigq->info.si_code = SI_TIMER; 592 + 593 + if (copy_to_user(created_timer_id, 594 + &new_timer_id, sizeof (new_timer_id))) { 595 + error = -EFAULT; 596 + goto out; 597 + } 587 598 588 599 error = CLOCK_DISPATCH(which_clock, timer_create, (new_timer)); 589 600 if (error)