aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/futex.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 6579912ee70c..c980a556f82c 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1567,6 +1567,13 @@ retry_locked:
1567 } 1567 }
1568 } 1568 }
1569 1569
1570 /*
1571 * If fixup_pi_state_owner() faulted and was unable to handle the
1572 * fault, unlock it and return the fault to userspace.
1573 */
1574 if (ret && (rt_mutex_owner(&q.pi_state->pi_mutex) == current))
1575 rt_mutex_unlock(&q.pi_state->pi_mutex);
1576
1570 /* Unqueue and drop the lock */ 1577 /* Unqueue and drop the lock */
1571 unqueue_me_pi(&q); 1578 unqueue_me_pi(&q);
1572 1579