Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3c74c52 authored by Namhyung Kim's avatar Namhyung Kim Committed by Thomas Gleixner
Browse files

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: default avatarNamhyung 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1dcc41bb

include/linux/thread_info.h

+2 −2
Original line number Diff line number Diff line
@@ -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 {

kernel/futex.c

+2 −2
Original line number Diff line number Diff line
@@ -1843,7 +1843,7 @@ static int futex_wait(u32 __user *uaddr, int fshared, 


	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 @@ static int futex_wait(u32 __user *uaddr, int fshared, 


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;