From: Will Deacon <will@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Will Deacon <will@kernel.org>, Eric Dumazet <edumazet@google.com>,
Jann Horn <jannh@google.com>, Kees Cook <keescook@chromium.org>,
Maddie Stone <maddiestone@google.com>,
Marco Elver <elver@google.com>,
"Paul E . McKenney" <paulmck@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
kernel-team@android.com, kernel-hardening@lists.openwall.com
Subject: [RFC PATCH 14/21] plist: Use CHECK_DATA_CORRUPTION instead of explicit {BUG,WARN}_ON()
Date: Tue, 24 Mar 2020 15:36:36 +0000 [thread overview]
Message-ID: <20200324153643.15527-15-will@kernel.org> (raw)
In-Reply-To: <20200324153643.15527-1-will@kernel.org>
CHECK_DATA_CORRUPTION() allows detected data corruption to result
consistently in either a BUG() or a WARN() depending on
CONFIG_BUG_ON_DATA_CORRUPTION.
Use CHECK_DATA_CORRUPTION() to report plist integrity checking failures,
rather than explicit use of BUG_ON() and WARN_ON().
Cc: Kees Cook <keescook@chromium.org>
Cc: Paul E. McKenney <paulmck@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Will Deacon <will@kernel.org>
---
lib/plist.c | 63 ++++++++++++++++++++++++++++++++++-------------------
1 file changed, 40 insertions(+), 23 deletions(-)
diff --git a/lib/plist.c b/lib/plist.c
index c06e98e78259..eb127eaab235 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -29,39 +29,46 @@
static struct plist_head test_head;
-static void plist_check_prev_next(struct list_head *t, struct list_head *p,
- struct list_head *n)
+static bool plist_prev_next_invalid(struct list_head *t, struct list_head *p,
+ struct list_head *n)
{
- WARN(n->prev != p || p->next != n,
- "top: %p, n: %p, p: %p\n"
- "prev: %p, n: %p, p: %p\n"
- "next: %p, n: %p, p: %p\n",
+ return CHECK_DATA_CORRUPTION(n->prev != p || p->next != n,
+ "plist corruption:\n"
+ "\ttop: %p, n: %p, p: %p\n"
+ "\tprev: %p, n: %p, p: %p\n"
+ "\tnext: %p, n: %p, p: %p\n",
t, t->next, t->prev,
p, p->next, p->prev,
n, n->next, n->prev);
}
-static void plist_check_list(struct list_head *top)
+static bool plist_list_invalid(struct list_head *top)
{
struct list_head *prev = top, *next = top->next;
+ bool corruption;
- plist_check_prev_next(top, prev, next);
+ corruption = plist_prev_next_invalid(top, prev, next);
while (next != top) {
prev = next;
next = prev->next;
- plist_check_prev_next(top, prev, next);
+ corruption |= plist_prev_next_invalid(top, prev, next);
}
+
+ return corruption;
}
-static void plist_check_head(struct plist_head *head)
+static bool plist_head_valid(struct plist_head *head)
{
+ bool corruption = false;
+
if (!plist_head_empty(head))
- plist_check_list(&plist_first(head)->prio_list);
- plist_check_list(&head->node_list);
+ corruption |= plist_list_invalid(&plist_first(head)->prio_list);
+ corruption |= plist_list_invalid(&head->node_list);
+ return !corruption;
}
#else
-# define plist_check_head(h) do { } while (0)
+# define plist_head_valid(h) (true)
#endif
/**
@@ -75,9 +82,12 @@ void plist_add(struct plist_node *node, struct plist_head *head)
struct plist_node *first, *iter, *prev = NULL;
struct list_head *node_next = &head->node_list;
- plist_check_head(head);
- WARN_ON(!plist_node_empty(node));
- WARN_ON(!list_empty(&node->prio_list));
+ if (!plist_head_valid(head) ||
+ CHECK_DATA_CORRUPTION(!plist_node_empty(node),
+ "plist_add corruption. node list is not empty.\n") ||
+ CHECK_DATA_CORRUPTION(!list_empty(&node->prio_list),
+ "plist_add corruption. node prio list is not empty.\n"))
+ return;
if (plist_head_empty(head))
goto ins_node;
@@ -100,7 +110,8 @@ void plist_add(struct plist_node *node, struct plist_head *head)
ins_node:
list_add_tail(&node->node_list, node_next);
- plist_check_head(head);
+ if (!plist_head_valid(head))
+ return;
}
/**
@@ -111,7 +122,8 @@ void plist_add(struct plist_node *node, struct plist_head *head)
*/
void plist_del(struct plist_node *node, struct plist_head *head)
{
- plist_check_head(head);
+ if (!plist_head_valid(head))
+ return;
if (!list_empty(&node->prio_list)) {
if (node->node_list.next != &head->node_list) {
@@ -129,7 +141,8 @@ void plist_del(struct plist_node *node, struct plist_head *head)
list_del_init(&node->node_list);
- plist_check_head(head);
+ if (!plist_head_valid(head))
+ return;
}
/**
@@ -147,9 +160,12 @@ void plist_requeue(struct plist_node *node, struct plist_head *head)
struct plist_node *iter;
struct list_head *node_next = &head->node_list;
- plist_check_head(head);
- BUG_ON(plist_head_empty(head));
- BUG_ON(plist_node_empty(node));
+ if (!plist_head_valid(head) ||
+ CHECK_DATA_CORRUPTION(plist_head_empty(head),
+ "plist_requeue corruption. head list is empty.\n") ||
+ CHECK_DATA_CORRUPTION(plist_node_empty(node),
+ "plist_requeue corruption. node list is empty.\n"))
+ return;
if (node == plist_last(head))
return;
@@ -169,7 +185,8 @@ void plist_requeue(struct plist_node *node, struct plist_head *head)
}
list_add_tail(&node->node_list, node_next);
- plist_check_head(head);
+ if (!plist_head_valid(head))
+ return;
}
#ifdef CONFIG_CHECK_INTEGRITY_PLIST
--
2.20.1
next prev parent reply other threads:[~2020-03-24 15:39 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 15:36 [RFC PATCH 00/21] Improve list integrity checking Will Deacon
2020-03-24 15:36 ` [RFC PATCH 01/21] list: Remove hlist_unhashed_lockless() Will Deacon
2020-03-24 16:27 ` Greg KH
2020-03-30 23:05 ` Paul E. McKenney
2020-03-24 15:36 ` [RFC PATCH 02/21] list: Remove hlist_nulls_unhashed_lockless() Will Deacon
2020-03-24 16:27 ` Greg KH
2020-03-30 23:07 ` Paul E. McKenney
2020-03-24 15:36 ` [RFC PATCH 03/21] list: Annotate lockless list primitives with data_race() Will Deacon
2020-03-24 16:20 ` Jann Horn
2020-03-24 16:26 ` Greg KH
2020-03-24 16:38 ` Jann Horn
2020-03-24 16:59 ` Greg KH
2020-03-24 18:22 ` Jann Horn
2020-03-24 16:23 ` Marco Elver
2020-03-24 21:33 ` Will Deacon
2020-03-31 13:10 ` Will Deacon
2020-04-01 6:34 ` Marco Elver
2020-04-01 8:40 ` Will Deacon
2020-03-24 16:51 ` Peter Zijlstra
2020-03-24 16:56 ` Jann Horn
2020-03-24 21:32 ` Will Deacon
2020-03-30 23:13 ` Paul E. McKenney
2020-04-24 17:39 ` Will Deacon
2020-04-27 19:24 ` Paul E. McKenney
2020-03-24 15:36 ` [RFC PATCH 04/21] timers: Use hlist_unhashed() instead of open-coding in timer_pending() Will Deacon
2020-03-24 16:30 ` Greg KH
2020-03-24 15:36 ` [RFC PATCH 05/21] list: Comment missing WRITE_ONCE() in __list_del() Will Deacon
2020-03-30 23:14 ` Paul E. McKenney
2020-03-24 15:36 ` [RFC PATCH 06/21] list: Remove superfluous WRITE_ONCE() from hlist_nulls implementation Will Deacon
2020-03-30 23:21 ` Paul E. McKenney
2020-03-24 15:36 ` [RFC PATCH 07/21] Revert "list: Use WRITE_ONCE() when adding to lists and hlists" Will Deacon
2020-03-30 23:19 ` Paul E. McKenney
2020-03-24 15:36 ` [RFC PATCH 08/21] Revert "list: Use WRITE_ONCE() when initializing list_head structures" Will Deacon
2020-03-30 23:25 ` Paul E. McKenney
2020-03-31 13:11 ` Will Deacon
2020-03-31 13:47 ` Paul E. McKenney
2020-03-24 15:36 ` [RFC PATCH 09/21] list: Remove unnecessary WRITE_ONCE() from hlist_bl_add_before() Will Deacon
2020-03-30 23:30 ` Paul E. McKenney
2020-03-31 12:37 ` Will Deacon
2020-03-24 15:36 ` [RFC PATCH 10/21] kernel-hacking: Make DEBUG_{LIST,PLIST,SG,NOTIFIERS} non-debug options Will Deacon
2020-03-24 16:42 ` Greg KH
2020-03-24 15:36 ` [RFC PATCH 11/21] list: Add integrity checking to hlist implementation Will Deacon
2020-03-24 15:36 ` [RFC PATCH 12/21] list: Poison ->next pointer for non-RCU deletion of 'hlist_nulls_node' Will Deacon
2020-03-30 23:32 ` Paul E. McKenney
2020-03-24 15:36 ` [RFC PATCH 13/21] list: Add integrity checking to hlist_nulls implementation Will Deacon
2020-03-24 15:36 ` Will Deacon [this message]
2020-03-24 16:42 ` [RFC PATCH 14/21] plist: Use CHECK_DATA_CORRUPTION instead of explicit {BUG,WARN}_ON() Greg KH
2020-03-24 15:36 ` [RFC PATCH 15/21] list_bl: Use CHECK_DATA_CORRUPTION instead of custom BUG_ON() wrapper Will Deacon
2020-03-24 15:36 ` [RFC PATCH 16/21] list_bl: Extend integrity checking in deletion routines Will Deacon
2020-03-24 15:36 ` [RFC PATCH 17/21] linux/bit_spinlock.h: Include linux/processor.h Will Deacon
2020-03-24 16:28 ` Greg KH
2020-03-24 21:08 ` Will Deacon
2020-03-24 15:36 ` [RFC PATCH 18/21] list_bl: Move integrity checking out of line Will Deacon
2020-03-24 15:36 ` [RFC PATCH 19/21] list_bl: Extend integrity checking to cover the same cases as 'hlist' Will Deacon
2020-03-24 15:36 ` [RFC PATCH 20/21] list: Format CHECK_DATA_CORRUPTION error messages consistently Will Deacon
2020-03-24 16:40 ` Greg KH
2020-03-24 15:36 ` [RFC PATCH 21/21] lkdtm: Extend list corruption checks Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200324153643.15527-15-will@kernel.org \
--to=will@kernel.org \
--cc=edumazet@google.com \
--cc=elver@google.com \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maddiestone@google.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).