diff options
| author | Kees Cook <keescook@chromium.org> | 2016-08-17 14:42:09 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2016-10-31 13:01:57 -0700 |
| commit | 54acd4397d7e7a725c94101180cd9f38ef701acc (patch) | |
| tree | b3da2a5050da80b8ca868981d454ba12b8c9213f /include/linux/rculist.h | |
| parent | d7c816733d501b59dbdc2483f2cc8e4431fd9160 (diff) | |
| download | linux-stable-54acd4397d7e7a725c94101180cd9f38ef701acc.tar.gz linux-stable-54acd4397d7e7a725c94101180cd9f38ef701acc.tar.bz2 linux-stable-54acd4397d7e7a725c94101180cd9f38ef701acc.zip | |
rculist: Consolidate DEBUG_LIST for list_add_rcu()
This commit consolidates the debug checking for list_add_rcu() into the
new single __list_add_valid() debug function. Notably, this commit fixes
the sanity check that was added in commit 17a801f4bfeb ("list_debug:
WARN for adding something already in the list"), which wasn't checking
RCU-protected lists.
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Rik van Riel <riel@redhat.com>
Diffstat (limited to 'include/linux/rculist.h')
| -rw-r--r-- | include/linux/rculist.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/rculist.h b/include/linux/rculist.h index 8beb98dcf14f..4f7a9561b8c4 100644 --- a/include/linux/rculist.h +++ b/include/linux/rculist.h @@ -45,19 +45,17 @@ static inline void INIT_LIST_HEAD_RCU(struct list_head *list) * This is only for internal list manipulation where we know * the prev/next entries already! */ -#ifndef CONFIG_DEBUG_LIST static inline void __list_add_rcu(struct list_head *new, struct list_head *prev, struct list_head *next) { + if (!__list_add_valid(new, prev, next)) + return; + new->next = next; new->prev = prev; rcu_assign_pointer(list_next_rcu(prev), new); next->prev = new; } -#else -void __list_add_rcu(struct list_head *new, - struct list_head *prev, struct list_head *next); -#endif /** * list_add_rcu - add a new entry to rcu-protected list |