Skip to content

Commit 16b3590

Browse files
ccpalexgregkh
authored andcommitted
locking/spinlock/debug: Fix data-race in do_raw_write_lock
commit c14ecb5 upstream. KCSAN reports: BUG: KCSAN: data-race in do_raw_write_lock / do_raw_write_lock write (marked) to 0xffff800009cf504c of 4 bytes by task 1102 on cpu 1: do_raw_write_lock+0x120/0x204 _raw_write_lock_irq do_exit call_usermodehelper_exec_async ret_from_fork read to 0xffff800009cf504c of 4 bytes by task 1103 on cpu 0: do_raw_write_lock+0x88/0x204 _raw_write_lock_irq do_exit call_usermodehelper_exec_async ret_from_fork value changed: 0xffffffff -> 0x00000001 Reported by Kernel Concurrency Sanitizer on: CPU: 0 PID: 1103 Comm: kworker/u4:1 6.1.111 Commit 1a365e8 ("locking/spinlock/debug: Fix various data races") has adressed most of these races, but seems to be not consistent/not complete. >From do_raw_write_lock() only debug_write_lock_after() part has been converted to WRITE_ONCE(), but not debug_write_lock_before() part. Do it now. Fixes: 1a365e8 ("locking/spinlock/debug: Fix various data races") Reported-by: Adrian Freihofer <adrian.freihofer@siemens.com> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@siemens.com> Signed-off-by: Boqun Feng <boqun.feng@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Paul E. McKenney <paulmck@kernel.org> Acked-by: Waiman Long <longman@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 759c8c3 commit 16b3590

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

kernel/locking/spinlock_debug.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ void do_raw_read_unlock(rwlock_t *lock)
184184
static inline void debug_write_lock_before(rwlock_t *lock)
185185
{
186186
RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
187-
RWLOCK_BUG_ON(lock->owner == current, lock, "recursion");
188-
RWLOCK_BUG_ON(lock->owner_cpu == raw_smp_processor_id(),
187+
RWLOCK_BUG_ON(READ_ONCE(lock->owner) == current, lock, "recursion");
188+
RWLOCK_BUG_ON(READ_ONCE(lock->owner_cpu) == raw_smp_processor_id(),
189189
lock, "cpu recursion");
190190
}
191191

0 commit comments

Comments
 (0)