linux-kernel - [PATCH v2] driver/core: Fix build error when SRCU and lockdep disabled

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-next>] [day] [month] [year] [list]

Message-Id: <20190812214918.101756-1-joel@joelfernandes.org>
Date:   Mon, 12 Aug 2019 17:49:17 -0400
From:   "Joel Fernandes (Google)" <joel@...lfernandes.org>
To:     linux-kernel@...r.kernel.org
Cc:     "Joel Fernandes (Google)" <joel@...lfernandes.org>,
        kernel-team@...roid.com, kbuild test robot <lkp@...el.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Josh Triplett <josh@...htriplett.org>,
        Lai Jiangshan <jiangshanlai@...il.com>,
        linux-doc@...r.kernel.org,
        Mathieu Desnoyers <mathieu.desnoyers@...icios.com>,
        "Paul E. McKenney" <paulmck@...ux.ibm.com>,
        "Rafael J. Wysocki" <rafael@...nel.org>, rcu@...r.kernel.org,
        Steven Rostedt <rostedt@...dmis.org>
Subject: [PATCH v2] driver/core: Fix build error when SRCU and lockdep disabled

Check if lockdep lock checking is disabled. If so, then do not define
device_links_read_lock_held(). It is used only from places where lockdep
checking is enabled.

Also fix a bug where I was not checking dep_map. Previously, I did not
test !SRCU configs so this got missed. Now it is sorted.

Link: https://lore.kernel.org/lkml/201908080026.WSAFx14k%25lkp@intel.com/
Fixes: c9e4d3a2fee8 ("acpi: Use built-in RCU list checking for acpi_ioremaps list")
 (Based on RCU's dev branch)

Cc: kernel-team@...roid.com
Cc: kbuild test robot <lkp@...el.com>,
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Cc: Josh Triplett <josh@...htriplett.org>,
Cc: Lai Jiangshan <jiangshanlai@...il.com>,
Cc: linux-doc@...r.kernel.org,
Cc: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>,
Cc: "Paul E. McKenney" <paulmck@...ux.ibm.com>,
Cc: "Rafael J. Wysocki" <rafael@...nel.org>,
Cc: rcu@...r.kernel.org,
Cc: Steven Rostedt <rostedt@...dmis.org>,

Reported-by: kbuild test robot <lkp@...el.com>
Signed-off-by: Joel Fernandes (Google) <joel@...lfernandes.org>
---
 drivers/base/core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 32cf83d1c744..c22271577c84 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -97,10 +97,12 @@ void device_links_read_unlock(int not_used)
 	up_read(&device_links_lock);
 }

+#ifdef CONFIG_DEBUG_LOCK_ALLOC
 int device_links_read_lock_held(void)
 {
-	return lock_is_held(&device_links_lock);
+	return lock_is_held(&(device_links_lock.dep_map));
 }
+#endif
 #endif /* !CONFIG_SRCU */

 /**
-- 
2.23.0.rc1.153.gdeed80330f-goog