From d3016ce02c7ba85c1c619771bb1aa349038626cd Mon Sep 17 00:00:00 2001 From: Jiyoung Yun Date: Thu, 30 Jun 2016 01:15:44 +0900 Subject: Fix robust mutex daedlock [BZ #20263] In Linux/ARM environment, a robust mutex can't catch the timeout result when it is already owned by other thread and requests to try lock with a specific time value(pthread_mutex_timedlock). The futex already returns the ETIMEDOUT result but there is no check the return value and it makes a deadlock. * nptl/lowlevelrobustlock.c: Implement ETIMEDOUT logic. --- nptl/lowlevelrobustlock.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'nptl') diff --git a/nptl/lowlevelrobustlock.c b/nptl/lowlevelrobustlock.c index 3b988b2e31..efe307e68b 100644 --- a/nptl/lowlevelrobustlock.c +++ b/nptl/lowlevelrobustlock.c @@ -118,8 +118,11 @@ __lll_robust_timedlock_wait (int *futex, const struct timespec *abstime, || !defined lll_futex_timed_wait_bitset) lll_futex_timed_wait (futex, newval, &rt, private); #else - lll_futex_timed_wait_bitset (futex, newval, abstime, - FUTEX_CLOCK_REALTIME, private); + int err = lll_futex_timed_wait_bitset (futex, newval, abstime, + FUTEX_CLOCK_REALTIME, private); + /* The futex call timed out. */ + if (err == -ETIMEDOUT) + return -err; #endif try: -- cgit 1.4.1