diff options
| author | Matthew Dawson <matthew@mjdsystems.ca> | 2016-03-11 13:08:07 -0800 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-09-10 16:36:09 -0400 |
| commit | db31d51c99eb6d9e8f7108c8b9d9f3ca3bc349af (patch) | |
| tree | 56fa37cecabcf2dd53093a54d5a35efefa9a7e51 | |
| parent | 2413d13773da5531ea7f75cd882c65951ceca100 (diff) | |
mm/mempool: avoid KASAN marking mempool poison checks as use-after-free
[ Upstream commit 7640131032db9118a78af715ac77ba2debeeb17c ]
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 <matthew@mjdsystems.ca>
Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | mm/mempool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempool.c b/mm/mempool.c index 2cc08de8b1db..70cccdcff860 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; } |