linux-kernel - [tip:locking/core] locking/rtmutex: Don't initialize lockdep when not required

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-cde50a67397c0da7d11795d4b4418384022ab8e6@git.kernel.org>
Date:   Tue, 20 Jun 2017 06:19:21 -0700
From:   "tip-bot for Levin, Alexander (Sasha Levin)" <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     alexander.levin@...izon.com, linux-kernel@...r.kernel.org,
        mingo@...nel.org, hpa@...or.com, peterz@...radead.org,
        tglx@...utronix.de, torvalds@...ux-foundation.org
Subject: [tip:locking/core] locking/rtmutex: Don't initialize lockdep when
 not required

Commit-ID:  cde50a67397c0da7d11795d4b4418384022ab8e6
Gitweb:     http://git.kernel.org/tip/cde50a67397c0da7d11795d4b4418384022ab8e6
Author:     Levin, Alexander (Sasha Levin) <alexander.levin@...izon.com>
AuthorDate: Sun, 18 Jun 2017 14:06:01 +0000
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 20 Jun 2017 11:53:09 +0200

locking/rtmutex: Don't initialize lockdep when not required

pi_mutex isn't supposed to be tracked by lockdep, but just
passing NULLs for name and key will cause lockdep to spew a
warning and die, which is not what we want it to do.

Skip lockdep initialization if the caller passed NULLs for
name and key, suggesting such initialization isn't desired.

Signed-off-by: Sasha Levin <alexander.levin@...izon.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Fixes: f5694788ad8d ("rt_mutex: Add lockdep annotations")
Link: http://lkml.kernel.org/r/20170618140548.4763-1-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 kernel/locking/rtmutex.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index 4312353..7806989 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1661,7 +1661,8 @@ void __rt_mutex_init(struct rt_mutex *lock, const char *name,
 	lock->waiters = RB_ROOT;
 	lock->waiters_leftmost = NULL;
 
-	debug_rt_mutex_init(lock, name, key);
+	if (name && key)
+		debug_rt_mutex_init(lock, name, key);
 }
 EXPORT_SYMBOL_GPL(__rt_mutex_init);