ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 04:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

list: Split list_del() debug checking into separate function

Browse Source 
Similar to the list_add() debug consolidation, this commit consolidates
the debug checking performed during CONFIG_DEBUG_LIST into a new
__list_del_entry_valid() function, and stops list updates when corruption
is found.

Refactored from same hardening in PaX and Grsecurity.

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>
This commit is contained in:
Kees Cook
2016-08-17 14:42:10 -07:00
committed by Paul E. McKenney
parent 54acd4397d
commit 0cd340dcb0
2 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/list_debug.c
View File

@@ -39,41 +39,34 @@ bool __list_add_valid(struct list_head *new, struct list_head *prev,
}
EXPORT_SYMBOL(__list_add_valid);
void __list_del_entry(struct list_head *entry)
bool __list_del_entry_valid(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;
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(prev, next);
}
EXPORT_SYMBOL(__list_del_entry);
/**
* 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_valid);