path: root/mm/mempool.c
diff options
authorMatthew Dawson <>2016-03-11 13:08:07 -0800
committerLinus Torvalds <>2016-03-11 16:17:47 -0800
commit7640131032db9118a78af715ac77ba2debeeb17c (patch)
treef95d88b244a0d55b0cc9461542826888db62c6a9 /mm/mempool.c
parent2a4fb270daa9c1f1d1b86a53d66ed86cc64ad232 (diff)
mm/mempool: avoid KASAN marking mempool poison checks as use-after-free
When removing an element from the mempool, mark it as unpoisoned in KASAN before verifying its contents for SLUB/SLAB debugging. Otherwise KASAN will flag the reads checking the element use-after-free writes as use-after-free reads. Signed-off-by: Matthew Dawson <> Acked-by: Andrey Ryabinin <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'mm/mempool.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempool.c b/mm/mempool.c
index 004d42b1dfaf..7924f4f58a6d 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -135,8 +135,8 @@ static void *remove_element(mempool_t *pool)
void *element = pool->elements[--pool->curr_nr];
BUG_ON(pool->curr_nr < 0);
- check_element(pool, element);
kasan_unpoison_element(pool, element);
+ check_element(pool, element);
return element;