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

Commit 4dc88029 authored by Dinakar Guniguntala's avatar Dinakar Guniguntala Committed by Ingo Molnar
Browse files

futex: Fix compat_futex to be same as futex for REQUEUE_PI 



Need to add the REQUEUE_PI checks to the compat_sys_futex API
as well to ensure 32 bit requeue's work fine on a 64 bit
system. Patch is against latest tip

Signed-off-by: default avatarDinakar Guniguntala <dino@in.ibm.com>
Cc: Darren Hart <dvhltc@us.ibm.com>
LKML-Reference: <20090810130142.GA23619@in.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2fc39111

kernel/futex_compat.c

+4 −2
Original line number Diff line number Diff line
@@ -180,7 +180,8 @@ asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val, 
	int cmd = op & FUTEX_CMD_MASK;



	if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI ||

		      cmd == FUTEX_WAIT_BITSET)) {

		      cmd == FUTEX_WAIT_BITSET ||

		      cmd == FUTEX_WAIT_REQUEUE_PI)) {

		if (get_compat_timespec(&ts, utime))

			return -EFAULT;

		if (!timespec_valid(&ts))
@@ -191,7 +192,8 @@ asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val, 
			t = ktime_add_safe(ktime_get(), t);

		tp = &t;

	}

	if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE)

	if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE ||

	    cmd == FUTEX_CMP_REQUEUE_PI || cmd == FUTEX_WAKE_OP)

		val2 = (int) (unsigned long) utime;



	return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);