diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2008-05-14 16:22:58 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-16 16:53:35 +0200 |
| commit | 493d35863dbb692c38c1415fd83d88dfb902ae37 (patch) | |
| tree | deaae5462c4a7319b3ff157e9594988ec5d3ceb1 /kernel/mutex-debug.c | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
| download | linux-3.10-493d35863dbb692c38c1415fd83d88dfb902ae37.tar.gz linux-3.10-493d35863dbb692c38c1415fd83d88dfb902ae37.tar.bz2 linux-3.10-493d35863dbb692c38c1415fd83d88dfb902ae37.zip | |
mutex-debug: check mutex magic before owner
Currently, the mutex debug code checks the lock->owner before lock->magic, so
a corrupt mutex will most likely result in failing the owner check, rather
than the magic check.
This change to debug_mutex_unlock does the magic check first, so
we have a better idea of what breaks.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/mutex-debug.c')
| -rw-r--r-- | kernel/mutex-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c index 3aaa06c561d..1d94160eb53 100644 --- a/kernel/mutex-debug.c +++ b/kernel/mutex-debug.c @@ -79,8 +79,8 @@ void debug_mutex_unlock(struct mutex *lock) if (unlikely(!debug_locks)) return; - DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info()); DEBUG_LOCKS_WARN_ON(lock->magic != lock); + DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info()); DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info()); } |