diff options
| author | Matthew Dawson | 2016-03-11 22:08:07 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2016-03-12 01:17:47 +0100 |
| commit | 7640131032db9118a78af715ac77ba2debeeb17c (patch) | |
| tree | f95d88b244a0d55b0cc9461542826888db62c6a9 /mm/mempool.c | |
| parent | Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... (diff) | |
| download | kernel-qcow2-linux-7640131032db9118a78af715ac77ba2debeeb17c.tar.gz kernel-qcow2-linux-7640131032db9118a78af715ac77ba2debeeb17c.tar.xz kernel-qcow2-linux-7640131032db9118a78af715ac77ba2debeeb17c.zip | |
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 <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>
Diffstat (limited to 'mm/mempool.c')
| -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 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; } |