The patch titled
mutex-debug: check mutex magic before owner
has been removed from the -mm tree. Its filename was
mutex-debug-check-mutex-magic-before-owner.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mutex-debug: check mutex magic before owner
From: Jeremy Kerr <jk@xxxxxxxxxx>
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@xxxxxxxxxx>
Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/mutex-debug.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/mutex-debug.c~mutex-debug-check-mutex-magic-before-owner kernel/mutex-debug.c
--- a/kernel/mutex-debug.c~mutex-debug-check-mutex-magic-before-owner
+++ a/kernel/mutex-debug.c
@@ -79,8 +79,8 @@ void debug_mutex_unlock(struct mutex *lo
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());
}
_
Patches currently in -mm which might be from jk@xxxxxxxxxx are
linux-next.patch
spufs-convert-nopfn-to-fault.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
