lkml.org 
[lkml]   [2010]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/3] posix_timer: move copy_to_user(created_timer_id) down in timer_create
    Date
    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>
    ---
    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 ad72342..9ca4973 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;
    --
    1.6.6


    \
     
     \ /
      Last update: 2010-05-17 19:21    [W:0.020 / U:51.600 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site