lkml.org 
[lkml]   [2010]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/3] futex: mark restart_block.futex.uaddr as a __user pointer
    Date
    @uaddr field in restart_block.futex is a user pointer but was
    missing __user markup. Add it and remove unnecessary castings.

    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    ---
    include/linux/thread_info.h | 4 ++--
    kernel/futex.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
    index a8cc4e1..c906965 100644
    --- a/include/linux/thread_info.h
    +++ b/include/linux/thread_info.h
    @@ -23,12 +23,12 @@ struct restart_block {
    };
    /* For futex_wait and futex_wait_requeue_pi */
    struct {
    - u32 *uaddr;
    + u32 __user *uaddr;
    u32 val;
    u32 flags;
    u32 bitset;
    u64 time;
    - u32 *uaddr2;
    + u32 __user *uaddr2;
    } futex;
    /* For nanosleep */
    struct {
    diff --git a/kernel/futex.c b/kernel/futex.c
    index 464de27..45e448a 100644
    --- a/kernel/futex.c
    +++ b/kernel/futex.c
    @@ -1843,7 +1843,7 @@ retry:

    restart = &current_thread_info()->restart_block;
    restart->fn = futex_wait_restart;
    - restart->futex.uaddr = (u32 *)uaddr;
    + restart->futex.uaddr = uaddr;
    restart->futex.val = val;
    restart->futex.time = abs_time->tv64;
    restart->futex.bitset = bitset;
    @@ -1869,7 +1869,7 @@ out:

    static long futex_wait_restart(struct restart_block *restart)
    {
    - u32 __user *uaddr = (u32 __user *)restart->futex.uaddr;
    + u32 __user *uaddr = restart->futex.uaddr;
    int fshared = 0;
    ktime_t t, *tp = NULL;

    --
    1.7.2.2


    \
     
     \ /
      Last update: 2010-09-14 14:47    [W:0.053 / U:0.820 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site