linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH URGENT for ftrace/core] lockdep: Fix error due to incorrect pointer return
@ 2018-07-28  4:15 Joel Fernandes
  0 siblings, 0 replies; only message in thread
From: Joel Fernandes @ 2018-07-28  4:15 UTC (permalink / raw)
  To: linux-kernel, Steven Rostedt
  Cc: kernel-team, Joel Fernandes (Google),
	Ingo Molnar, Peter Zijlstra, Will Deacon

From: "Joel Fernandes (Google)" <joel@joelfernandes.org>

The 0-day bot caught an issue which all my tests missed (will add it
into my tests) where this_cpu_ptr is incorrectly returning the wrong
pointer from get_lock_stats. Fix it.

Fixes: f4ac253a8df0 ("lockdep: use this_cpu_ptr instead of get_cpu_var stats")
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
---
 kernel/locking/lockdep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index a6a6b7eb4b82..03bfaeb9f4e6 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -249,7 +249,7 @@ void clear_lock_stats(struct lock_class *class)
 
 static struct lock_class_stats *get_lock_stats(struct lock_class *class)
 {
-	return &this_cpu_ptr(&cpu_lock_stats)[class - lock_classes];
+	return &this_cpu_ptr(cpu_lock_stats)[class - lock_classes];
 }
 
 static void lock_release_holdtime(struct held_lock *hlock)
-- 
2.18.0.345.g5c9ce644c3-goog


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2018-07-28  4:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-28  4:15 [PATCH URGENT for ftrace/core] lockdep: Fix error due to incorrect pointer return Joel Fernandes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).