[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200324153643.15527-19-will@kernel.org>
Date: Tue, 24 Mar 2020 15:36:40 +0000
From: Will Deacon <will@...nel.org>
To: linux-kernel@...r.kernel.org
Cc: Will Deacon <will@...nel.org>,
Eric Dumazet <edumazet@...gle.com>,
Jann Horn <jannh@...gle.com>,
Kees Cook <keescook@...omium.org>,
Maddie Stone <maddiestone@...gle.com>,
Marco Elver <elver@...gle.com>,
"Paul E . McKenney" <paulmck@...nel.org>,
Peter Zijlstra <peterz@...radead.org>,
Thomas Gleixner <tglx@...utronix.de>,
kernel-team@...roid.com,
kernel-hardening@...ts.openwall.com
Subject: [RFC PATCH 18/21] list_bl: Move integrity checking out of line
In preparation for adding full integrity checking to 'hlist_bl', move
the checks out of line before they become more bloated. At the same,
swap the argument order for __hlist_bl_add_head_valid() so that it
follows the same convention as __hlist_add_head_valid().
Signed-off-by: Will Deacon <will@...nel.org>
---
include/linux/list_bl.h | 34 ++++++----------------------------
include/linux/rculist_bl.h | 2 +-
lib/list_debug.c | 28 ++++++++++++++++++++++++++++
3 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/include/linux/list_bl.h b/include/linux/list_bl.h
index 0839c4f43e6d..dd74043ebae6 100644
--- a/include/linux/list_bl.h
+++ b/include/linux/list_bl.h
@@ -33,34 +33,12 @@ struct hlist_bl_node {
};
#ifdef CONFIG_CHECK_INTEGRITY_LIST
-static inline bool __hlist_bl_add_head_valid(struct hlist_bl_head *h,
- struct hlist_bl_node *n)
-{
- unsigned long hlock = (unsigned long)h->first & LIST_BL_LOCKMASK;
- unsigned long nlock = (unsigned long)n & LIST_BL_LOCKMASK;
-
- return !(CHECK_DATA_CORRUPTION(nlock,
- "hlist_bl_add_head: node is locked\n") ||
- CHECK_DATA_CORRUPTION(hlock != LIST_BL_LOCKMASK,
- "hlist_bl_add_head: head is unlocked\n"));
-}
-
-static inline bool __hlist_bl_del_valid(struct hlist_bl_node *n)
-{
- unsigned long nlock = (unsigned long)n & LIST_BL_LOCKMASK;
-
- return !(CHECK_DATA_CORRUPTION(nlock,
- "hlist_bl_del_valid: node locked") ||
- CHECK_DATA_CORRUPTION(n->next == LIST_POISON1,
- "hlist_bl_del corruption, %px->next is LIST_POISON1 (%px)\n",
- n, LIST_POISON1) ||
- CHECK_DATA_CORRUPTION(n->pprev == LIST_POISON2,
- "hlist_bl_del corruption, %px->pprev is LIST_POISON2 (%px)\n",
- n, LIST_POISON2));
-}
+extern bool __hlist_bl_add_head_valid(struct hlist_bl_node *n,
+ struct hlist_bl_head *h);
+extern bool __hlist_bl_del_valid(struct hlist_bl_node *node);
#else
-static inline bool __hlist_bl_add_head_valid(struct hlist_bl_head *h,
- struct hlist_bl_node *n)
+static inline bool __hlist_bl_add_head_valid(struct hlist_bl_node *n,
+ struct hlist_bl_head *h)
{
return true;
}
@@ -103,7 +81,7 @@ static inline void hlist_bl_add_head(struct hlist_bl_node *n,
{
struct hlist_bl_node *first = hlist_bl_first(h);
- if (!__hlist_bl_add_head_valid(h, n))
+ if (!__hlist_bl_add_head_valid(n, h))
return;
n->next = first;
diff --git a/include/linux/rculist_bl.h b/include/linux/rculist_bl.h
index 553ce3cde104..9356e7283ff0 100644
--- a/include/linux/rculist_bl.h
+++ b/include/linux/rculist_bl.h
@@ -63,7 +63,7 @@ static inline void hlist_bl_add_head_rcu(struct hlist_bl_node *n,
{
struct hlist_bl_node *first;
- if (!__hlist_bl_add_head_valid(h, n))
+ if (!__hlist_bl_add_head_valid(n, h))
return;
/* don't need hlist_bl_first_rcu because we're under lock */
diff --git a/lib/list_debug.c b/lib/list_debug.c
index b3560de4accc..9591fa6c9337 100644
--- a/lib/list_debug.c
+++ b/lib/list_debug.c
@@ -186,3 +186,31 @@ bool __hlist_nulls_del_valid(struct hlist_nulls_node *node)
return true;
}
EXPORT_SYMBOL(__hlist_nulls_del_valid);
+
+bool __hlist_bl_add_head_valid(struct hlist_bl_node *new,
+ struct hlist_bl_head *head)
+{
+ unsigned long hlock = (unsigned long)head->first & LIST_BL_LOCKMASK;
+ unsigned long nlock = (unsigned long)new & LIST_BL_LOCKMASK;
+
+ return !(CHECK_DATA_CORRUPTION(nlock,
+ "hlist_bl_add_head: node is locked\n") ||
+ CHECK_DATA_CORRUPTION(hlock != LIST_BL_LOCKMASK,
+ "hlist_bl_add_head: head is unlocked\n"));
+}
+EXPORT_SYMBOL(__hlist_bl_add_head_valid);
+
+bool __hlist_bl_del_valid(struct hlist_bl_node *node)
+{
+ unsigned long nlock = (unsigned long)node & LIST_BL_LOCKMASK;
+
+ return !(CHECK_DATA_CORRUPTION(nlock,
+ "hlist_bl_del_valid: node locked") ||
+ CHECK_DATA_CORRUPTION(node->next == LIST_POISON1,
+ "hlist_bl_del corruption, %px->next is LIST_POISON1 (%px)\n",
+ node, LIST_POISON1) ||
+ CHECK_DATA_CORRUPTION(node->pprev == LIST_POISON2,
+ "hlist_bl_del corruption, %px->pprev is LIST_POISON2 (%px)\n",
+ node, LIST_POISON2));
+}
+EXPORT_SYMBOL(__hlist_bl_del_valid);
--
2.20.1
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
