Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

futex: Mark restart_block.futex.uaddr[2] __user

Browse source 
@uaddr and @uaddr2 fields in restart_block.futex are user
pointers. Add __user and remove unnecessary casts.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Darren Hart <dvhltc@us.ibm.com>
LKML-Reference: <1284468228-8723-2-git-send-email-namhyung@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Namhyung Kim 2010-09-14 21:43:47 +09:00 committed by Thomas Gleixner
parent 1dcc41bb03
commit a3c74c5257
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/linux/thread_info.h
View file

@ -23,12 +23,12 @@ struct restart_block {
}; };
/* For futex_wait and futex_wait_requeue_pi */ /* For futex_wait and futex_wait_requeue_pi */
struct { struct {
u32 *uaddr; u32 __user *uaddr;
u32 val; u32 val;
u32 flags; u32 flags;
u32 bitset; u32 bitset;
u64 time; u64 time;
u32 *uaddr2; u32 __user *uaddr2;
} futex; } futex;
/* For nanosleep */ /* For nanosleep */
struct { struct {

4
kernel/futex.c
View file

@ -1843,7 +1843,7 @@ static int futex_wait(u32 __user *uaddr, int fshared,
restart = &current_thread_info()->restart_block; restart = &current_thread_info()->restart_block;
restart->fn = futex_wait_restart; restart->fn = futex_wait_restart;
restart->futex.uaddr = (u32 *)uaddr; restart->futex.uaddr = uaddr;
restart->futex.val = val; restart->futex.val = val;
restart->futex.time = abs_time->tv64; restart->futex.time = abs_time->tv64;
restart->futex.bitset = bitset; restart->futex.bitset = bitset;
@ -1869,7 +1869,7 @@ static int futex_wait(u32 __user *uaddr, int fshared,
static long futex_wait_restart(struct restart_block *restart) 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; int fshared = 0;
ktime_t t, *tp = NULL; ktime_t t, *tp = NULL;