Messages in this thread Patch in this message | | | From | Darren Hart <> | Subject | [PATCH V4] futex: set FLAGS_HAS_TIMEOUT during demux for FUTEX_WAIT | Date | Thu, 14 Apr 2011 14:43:01 -0700 |
| |
The FLAGS_HAS_TIMEOUT flag was not getting set, causing the restart_block to restart futex_wait() without a timeout after a signal.
Commit b41277dc7a18ee332d 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
V2: Added references to commit message. V3: Set flag during restart block instead of do_futex() V4: Correct stupid order of assignment mistake pointed out by Eric
Signed-off-by: Darren Hart <dvhart@linux.intel.com> Reported-by: Tim Smith <tsmith201104@yahoo.com> Reported-by: Torsten Hilbrich <torsten.hilbrich@secunet.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@elte.hu> CC: Eric Dumazet <eric.dumazet@gmail.com> CC: John Kacur <jkacur@redhat.com> --- kernel/futex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/futex.c b/kernel/futex.c index bda4157..abd5324 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1886,7 +1886,7 @@ retry: restart->futex.val = val; restart->futex.time = abs_time->tv64; restart->futex.bitset = bitset; - restart->futex.flags = flags; + restart->futex.flags = flags | FLAGS_HAS_TIMEOUT; ret = -ERESTART_RESTARTBLOCK; -- 1.7.1
| |