lkml.org 
[lkml]   [2017]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.10 60/63] futex: Add missing error handling to FUTEX_REQUEUE_PI
    Date
    4.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Peter Zijlstra <peterz@infradead.org>

    commit 9bbb25afeb182502ca4f2c4f3f88af0681b34cae upstream.

    Thomas spotted that fixup_pi_state_owner() can return errors and we
    fail to unlock the rt_mutex in that case.

    Reported-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Reviewed-by: Darren Hart <dvhart@linux.intel.com>
    Cc: juri.lelli@arm.com
    Cc: bigeasy@linutronix.de
    Cc: xlpang@redhat.com
    Cc: rostedt@goodmis.org
    Cc: mathieu.desnoyers@efficios.com
    Cc: jdesfossez@efficios.com
    Cc: dvhart@infradead.org
    Cc: bristot@redhat.com
    Link: http://lkml.kernel.org/r/20170304093558.867401760@infradead.org
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    kernel/futex.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/kernel/futex.c
    +++ b/kernel/futex.c
    @@ -2896,6 +2896,8 @@ static int futex_wait_requeue_pi(u32 __u
    if (q.pi_state && (q.pi_state->owner != current)) {
    spin_lock(q.lock_ptr);
    ret = fixup_pi_state_owner(uaddr2, &q, current);
    + if (ret && rt_mutex_owner(&q.pi_state->pi_mutex) == current)
    + rt_mutex_unlock(&q.pi_state->pi_mutex);
    /*
    * Drop the reference to the pi state which
    * the requeue_pi() code acquired for us.

    \
     
     \ /
      Last update: 2017-03-20 19:13    [W:4.219 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site