Commit 0cd9c649 authored Apr 14, 2011 by Darren Hart Committed by Thomas Gleixner Apr 15, 2011

futex: Set FLAGS_HAS_TIMEOUT during futex_wait restart setup

The FLAGS_HAS_TIMEOUT flag was not getting set, causing the restart_block to
restart futex_wait() without a timeout after a signal.

Commit b41277dc in 2.6.38 introduced the regression by accidentally
removing the the FLAGS_HAS_TIMEOUT assignment from futex_wait() during the setup
of the restart block. Restore the originaly behavior.

Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=32922



Reported-by: Tim Smith <tsmith201104@yahoo.com>
Reported-by: Torsten Hilbrich <torsten.hilbrich@secunet.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Kacur <jkacur@redhat.com>
Cc: stable@kernel.org
Link: http://lkml.kernel.org/r/%3Cdaac0eb3af607f72b9a4d3126b2ba8fb5ed3b883.1302820917.git.dvhart%40linux.intel.com%3E


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent a6360dd3

kernel/futex.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1886,7 +1886,7 @@ retry:
	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;
	restart->futex.flags = flags;		restart->futex.flags = flags \| FLAGS_HAS_TIMEOUT;

	ret = -ERESTART_RESTARTBLOCK;		ret = -ERESTART_RESTARTBLOCK;

Admin message