lkml.org 
[lkml]   [2016]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/5] list: Split list_del() debug checking into separate function
Date
Similar to the list_add() debug consolidation, this consolidates the
debug checking performed during CONFIG_DEBUG_LIST, and stops list
updates when corruption is found.

Refactored from same hardening in PaX and Grsecurity.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
include/linux/list.h | 15 +++++++++------
lib/list_debug.c | 53 +++++++++++++++++++++++-----------------------------
2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/include/linux/list.h b/include/linux/list.h
index c38ff652ab59..09b857a0dda1 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -32,6 +32,7 @@ static inline void INIT_LIST_HEAD(struct list_head *list)
extern bool __list_add_debug(struct list_head *new,
struct list_head *prev,
struct list_head *next);
+extern bool __list_del_entry_debug(struct list_head *entry);
#else
static inline bool __list_add_debug(struct list_head *new,
struct list_head *prev,
@@ -39,6 +40,10 @@ static inline bool __list_add_debug(struct list_head *new,
{
return true;
}
+static inline bool __list_del_entry_debug(struct list_head *entry)
+{
+ return true;
+}
#endif

/*
@@ -106,22 +111,20 @@ static inline void __list_del(struct list_head * prev, struct list_head * next)
* Note: list_empty() on entry does not return true after this, the entry is
* in an undefined state.
*/
-#ifndef CONFIG_DEBUG_LIST
static inline void __list_del_entry(struct list_head *entry)
{
+ if (!__list_del_entry_debug(entry))
+ return;
+
__list_del(entry->prev, entry->next);
}

static inline void list_del(struct list_head *entry)
{
- __list_del(entry->prev, entry->next);
+ __list_del_entry(entry);
entry->next = LIST_POISON1;
entry->prev = LIST_POISON2;
}
-#else
-extern void __list_del_entry(struct list_head *entry);
-extern void list_del(struct list_head *entry);
-#endif

/**
* list_replace - replace old entry by new one
diff --git a/lib/list_debug.c b/lib/list_debug.c
index e90a931bd5ab..80e2e40a6a4e 100644
--- a/lib/list_debug.c
+++ b/lib/list_debug.c
@@ -42,41 +42,34 @@ bool __list_add_debug(struct list_head *new,
}
EXPORT_SYMBOL(__list_add_debug);

-void __list_del_entry(struct list_head *entry)
+bool __list_del_entry_debug(struct list_head *entry)
{
struct list_head *prev, *next;

prev = entry->prev;
next = entry->next;

- if (WARN(next == LIST_POISON1,
- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
- entry, LIST_POISON1) ||
- WARN(prev == LIST_POISON2,
- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
- entry, LIST_POISON2) ||
- WARN(prev->next != entry,
- "list_del corruption. prev->next should be %p, "
- "but was %p\n", entry, prev->next) ||
- WARN(next->prev != entry,
- "list_del corruption. next->prev should be %p, "
- "but was %p\n", entry, next->prev))
- return;
-
- __list_del(prev, next);
-}
-EXPORT_SYMBOL(__list_del_entry);
+ if (unlikely(next == LIST_POISON1)) {
+ WARN(1, "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
+ entry, LIST_POISON1);
+ return false;
+ }
+ if (unlikely(prev == LIST_POISON2)) {
+ WARN(1, "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
+ entry, LIST_POISON2);
+ return false;
+ }
+ if (unlikely(prev->next != entry)) {
+ WARN(1, "list_del corruption. prev->next should be %p, but was %p\n",
+ entry, prev->next);
+ return false;
+ }
+ if (unlikely(next->prev != entry)) {
+ WARN(1, "list_del corruption. next->prev should be %p, but was %p\n",
+ entry, next->prev);
+ return false;
+ }
+ return true;

-/**
- * list_del - deletes entry from list.
- * @entry: the element to delete from the list.
- * Note: list_empty on entry does not return true after this, the entry is
- * in an undefined state.
- */
-void list_del(struct list_head *entry)
-{
- __list_del_entry(entry);
- entry->next = LIST_POISON1;
- entry->prev = LIST_POISON2;
}
-EXPORT_SYMBOL(list_del);
+EXPORT_SYMBOL(__list_del_entry_debug);
--
2.7.4
\
 
 \ /
  Last update: 2016-09-17 09:57    [W:0.078 / U:1.436 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site