diff mbox series

[mm,14/21] mempool: use new mempool KASAN hooks

Message ID	d36fc4a6865bdbd297cadb46b67641d436849f4c.1703024586.git.andreyknvl@google.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel+bounces-6054-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; From: andrey.konovalov@linux.dev To: Marco Elver <elver@google.com>, Alexander Potapenko <glider@google.com> Cc: Andrey Konovalov <andreyknvl@gmail.com>, Dmitry Vyukov <dvyukov@google.com>, Andrey Ryabinin <ryabinin.a.a@gmail.com>, kasan-dev@googlegroups.com, Evgenii Stepanov <eugenis@google.com>, Breno Leitao <leitao@debian.org>, Alexander Lobakin <alobakin@pm.me>, Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov <andreyknvl@google.com> Subject: [PATCH mm 14/21] mempool: use new mempool KASAN hooks Date: Tue, 19 Dec 2023 23:28:58 +0100 Message-Id: <d36fc4a6865bdbd297cadb46b67641d436849f4c.1703024586.git.andreyknvl@google.com> In-Reply-To: <cover.1703024586.git.andreyknvl@google.com> References: <cover.1703024586.git.andreyknvl@google.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	kasan: save mempool stack traces \| [mm,00/21] kasan: save mempool stack traces [mm,01/21] kasan: rename kasan_slab_free_mempool to kasan_mempool_poison_object [mm,02/21] kasan: move kasan_mempool_poison_object [mm,03/21] kasan: document kasan_mempool_poison_object [mm,04/21] kasan: add return value for kasan_mempool_poison_object [mm,05/21] kasan: introduce kasan_mempool_unpoison_object [mm,06/21] kasan: introduce kasan_mempool_poison_pages [mm,07/21] kasan: introduce kasan_mempool_unpoison_pages [mm,08/21] kasan: clean up __kasan_mempool_poison_object [mm,09/21] kasan: save free stack traces for slab mempools [mm,10/21] kasan: clean up and rename ____kasan_kmalloc [mm,11/21] kasan: introduce poison_kmalloc_large_redzone [mm,12/21] kasan: save alloc stack traces for mempool [mm,13/21] mempool: skip slub_debug poisoning when KASAN is enabled [mm,14/21] mempool: use new mempool KASAN hooks [mm,15/21] mempool: introduce mempool_use_prealloc_only [mm,16/21] kasan: add mempool tests [mm,17/21] kasan: rename pagealloc tests [mm,18/21] kasan: reorder tests [mm,19/21] kasan: rename and document kasan_(un)poison_object_data [mm,20/21] skbuff: use mempool KASAN hooks [mm,21/21] io_uring: use mempool KASAN hook

Commit Message

andrey.konovalov@linux.dev Dec. 19, 2023, 10:28 p.m. UTC

  From: Andrey Konovalov <andreyknvl@google.com>

Update the mempool code to use the new mempool KASAN hooks.

Rely on the return value of kasan_mempool_poison_object and
kasan_mempool_poison_pages to prevent double-free and invalid-free bugs.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
 mm/mempool.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff mbox series

Patch

diff --git a/mm/mempool.c b/mm/mempool.c
index 1fd39478c85e..103dc4770cfb 100644
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -112,32 +112,34 @@  static inline void poison_element(mempool_t *pool, void *element)
 }
 #endif /* CONFIG_DEBUG_SLAB || CONFIG_SLUB_DEBUG_ON */
 
-static __always_inline void kasan_poison_element(mempool_t *pool, void *element)
+static __always_inline bool kasan_poison_element(mempool_t *pool, void *element)
 {
 	if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc)
-		kasan_mempool_poison_object(element);
+		return kasan_mempool_poison_object(element);
 	else if (pool->alloc == mempool_alloc_pages)
-		kasan_poison_pages(element, (unsigned long)pool->pool_data,
-				   false);
+		return kasan_mempool_poison_pages(element,
+						(unsigned long)pool->pool_data);
+	return true;
 }
 
 static void kasan_unpoison_element(mempool_t *pool, void *element)
 {
 	if (pool->alloc == mempool_kmalloc)
-		kasan_unpoison_range(element, (size_t)pool->pool_data);
+		kasan_mempool_unpoison_object(element, (size_t)pool->pool_data);
 	else if (pool->alloc == mempool_alloc_slab)
-		kasan_unpoison_range(element, kmem_cache_size(pool->pool_data));
+		kasan_mempool_unpoison_object(element,
+					      kmem_cache_size(pool->pool_data));
 	else if (pool->alloc == mempool_alloc_pages)
-		kasan_unpoison_pages(element, (unsigned long)pool->pool_data,
-				     false);
+		kasan_mempool_unpoison_pages(element,
+					     (unsigned long)pool->pool_data);
 }
 
 static __always_inline void add_element(mempool_t *pool, void *element)
 {
 	BUG_ON(pool->curr_nr >= pool->min_nr);
 	poison_element(pool, element);
-	kasan_poison_element(pool, element);
-	pool->elements[pool->curr_nr++] = element;
+	if (kasan_poison_element(pool, element))
+		pool->elements[pool->curr_nr++] = element;
 }
 
 static void *remove_element(mempool_t *pool)