futex: Mark restart_block.futex.uaddr[2] __user
@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:
Родитель
1dcc41bb03
Коммит
a3c74c5257
|
@ -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 {
|
||||||
|
|
|
@ -1843,7 +1843,7 @@ retry:
|
||||||
|
|
||||||
restart = ¤t_thread_info()->restart_block;
|
restart = ¤t_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 @@ out:
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче