[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180917225336.1953-1-kaarle.ritvanen@datakunkku.fi>
Date: Tue, 18 Sep 2018 01:53:36 +0300
From: Kaarle Ritvanen <kaarle.ritvanen@...akunkku.fi>
To: musl@...ts.openwall.com
Cc: Kaarle Ritvanen <kaarle.ritvanen@...akunkku.fi>
Subject: [PATCH] fix race condition in file locking
The condition occurs when
- thread #1 is holding the lock
- thread #2 is waiting for it on __futexwait
- thread #1 is about to release the lock and performs a_swap
- thread #3 enters the __lockfile function and manages to grab the lock
before thread #1 calls __wake, resetting the MAYBE_WAITERS flag
- thread #1 calls __wake
- thread #2 wakes up but goes again to __futexwait as the lock is
held by thread #3
- thread #3 releases the lock but does not call __wake as the
MAYBE_WAITERS flag is not set
This condition results in thread #2 not being woken up. This patch fixes
the problem by making the woken up thread ensure that the flag is properly set
before going to sleep again.
---
src/stdio/__lockfile.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c
index 2ff75d8a..f6adefb6 100644
--- a/src/stdio/__lockfile.c
+++ b/src/stdio/__lockfile.c
@@ -8,13 +8,12 @@ int __lockfile(FILE *f)
int owner = f->lock, tid = __pthread_self()->tid;
if ((owner & ~MAYBE_WAITERS) == tid)
return 0;
- for (;;) {
- owner = a_cas(&f->lock, 0, tid);
- if (!owner) return 1;
- if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) break;
+ owner = a_cas(&f->lock, 0, tid);
+ if (!owner) return 1;
+ while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) {
+ if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner)
+ __futexwait(&f->lock, owner, 1);
}
- while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS)))
- __futexwait(&f->lock, owner, 1);
return 1;
}
--
2.14.4
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
