Messages in this thread | | | Subject | Re: [PATCH] futex: set FLAGS_HAS_TIMEOUT during demux for FUTEX_WAIT | From | Eric Dumazet <> | Date | Thu, 14 Apr 2011 19:09:09 +0200 |
| |
Le jeudi 14 avril 2011 à 09:58 -0700, Darren Hart a écrit : > The FLAGS_HAS_TIMEOUT flag was not getting set, causing the restart_block to > restart futex_wait() without a timeout after a signal. > > 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 | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/kernel/futex.c b/kernel/futex.c > index bda4157..6eac6b6 100644 > --- a/kernel/futex.c > +++ b/kernel/futex.c > @@ -2589,6 +2589,9 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, > return -ENOSYS; > } > > + if (timeout) > + flags |= FLAGS_HAS_TIMEOUT; > + > switch (cmd) { > case FUTEX_WAIT: > val3 = FUTEX_BITSET_MATCH_ANY;
Hmm, could you please add in the changelog the commit id introducing the bug ?
I suspect its b41277dc7a18ee332d, added in 2.6.38 ?
Thanks
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |