diff options
| author | davidxu <davidxu@FreeBSD.org> | 2008-09-16 01:46:11 +0000 |
|---|---|---|
| committer | davidxu <davidxu@FreeBSD.org> | 2008-09-16 01:46:11 +0000 |
| commit | 612ed6bb13e3eba8b695dd42d0ece8ca60233703 (patch) | |
| tree | 5ab66ac98cafb8b41c940604c8e79e1bd9507c84 /libexec | |
| parent | 1e7ba9e4d7553e0894301015363d335775a7a65b (diff) | |
| download | FreeBSD-src-612ed6bb13e3eba8b695dd42d0ece8ca60233703.zip FreeBSD-src-612ed6bb13e3eba8b695dd42d0ece8ca60233703.tar.gz | |
Allow multiple locks to be acquired by detecting corresponding
bit flag, otherwise if a thread acquired a lock, another thread
or the current thread itself can no longer acquire another lock
because thread_mask_set() return whole flag word, this results
bit leaking in the word and misbehavior in later locking and
unlocking.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/rtld_lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c index c67f5fb..5bb891a 100644 --- a/libexec/rtld-elf/rtld_lock.c +++ b/libexec/rtld-elf/rtld_lock.c @@ -184,7 +184,7 @@ rtld_lock_t rtld_phdr_lock = &rtld_locks[2]; int rlock_acquire(rtld_lock_t lock) { - if (thread_mask_set(lock->mask)) { + if (thread_mask_set(lock->mask) & lock->mask) { dbg("rlock_acquire: recursed"); return (0); } @@ -195,7 +195,7 @@ rlock_acquire(rtld_lock_t lock) int wlock_acquire(rtld_lock_t lock) { - if (thread_mask_set(lock->mask)) { + if (thread_mask_set(lock->mask) & lock->mask) { dbg("wlock_acquire: recursed"); return (0); } |
