[lkml]   [2011]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH V2] futex: set FLAGS_HAS_TIMEOUT during demux for FUTEX_WAIT
    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. It makes more sense to set the flag earlier during
    do_futex() where the other flags are set, although futex_wait is the only user
    of FLAGS_HAS_TIMEOUT as it is the only op using a relative timeout (an
    unfortunately preexisting condition).


    V2: Added references to commit message.

    Signed-off-by: Darren Hart <>
    Reported-by: Tim Smith <>
    Reported-by: Torsten Hilbrich <>
    Cc: Thomas Gleixner <>
    Cc: Peter Zijlstra <>
    Cc: Ingo Molnar <>
    CC: Eric Dumazet <>
    CC: John Kacur <>
    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:

     \ /
      Last update: 2011-04-14 20:49    [W:0.020 / U:0.204 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site