lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 107/109] futex: Test for pi_mutex on fault in futex_wait_requeue_pi()
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.4-stable review patch. If anyone has any objections, please let me know.

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

    From: Darren Hart <dvhart@linux.intel.com>

    commit b6070a8d9853eda010a549fa9a09eb8d7269b929 upstream.

    If fixup_pi_state_owner() faults, pi_mutex may be NULL. Test
    for pi_mutex != NULL before testing the owner against current
    and possibly unlocking it.

    Signed-off-by: Darren Hart <dvhart@linux.intel.com>
    Cc: Dave Jones <davej@redhat.com>
    Cc: Dan Carpenter <dan.carpenter@oracle.com>
    Link: http://lkml.kernel.org/r/dc59890338fc413606f04e5c5b131530734dae3d.1342809673.git.dvhart@linux.intel.com
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/kernel/futex.c
    +++ b/kernel/futex.c
    @@ -2370,7 +2370,7 @@ static int futex_wait_requeue_pi(u32 __u
    * fault, unlock the rt_mutex and return the fault to userspace.
    */
    if (ret == -EFAULT) {
    - if (rt_mutex_owner(pi_mutex) == current)
    + if (pi_mutex && rt_mutex_owner(pi_mutex) == current)
    rt_mutex_unlock(pi_mutex);
    } else if (ret == -EINTR) {
    /*



    \
     
     \ /
      Last update: 2012-08-08 02:21    [W:0.040 / U:0.076 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site