diff mbox series

[mm,21/21] io_uring: use mempool KASAN hook

Message ID	eca18d6cbf676ed784f1a1f209c386808a8087c5.1703024586.git.andreyknvl@google.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel+bounces-6063-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; 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 21/21] io_uring: use mempool KASAN hook Date: Tue, 19 Dec 2023 23:29:05 +0100 Message-Id: <eca18d6cbf676ed784f1a1f209c386808a8087c5.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:29 p.m. UTC

  From: Andrey Konovalov <andreyknvl@google.com>

Use the proper kasan_mempool_unpoison_object hook for unpoisoning cached
objects.

A future change might also update io_uring to check the return value of
kasan_mempool_poison_object to prevent double-free and invalid-free bugs.
This proves to be non-trivial with the current way io_uring caches
objects, so this is left out-of-scope of this series.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
 io_uring/alloc_cache.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/io_uring/alloc_cache.h b/io_uring/alloc_cache.h
index 8de0414e8efe..bf2fb26a6539 100644
--- a/io_uring/alloc_cache.h
+++ b/io_uring/alloc_cache.h
@@ -33,7 +33,7 @@  static inline struct io_cache_entry *io_alloc_cache_get(struct io_alloc_cache *c
 		struct io_cache_entry *entry;
 
 		entry = container_of(cache->list.next, struct io_cache_entry, node);
-		kasan_unpoison_range(entry, cache->elem_size);
+		kasan_mempool_unpoison_object(entry, cache->elem_size);
 		cache->list.next = cache->list.next->next;
 		cache->nr_cached--;
 		return entry;