diff mbox series

[mm,08/21] kasan: clean up __kasan_mempool_poison_object

Message ID	4f6fc8840512286c1a96e16e86901082c671677d.1703024586.git.andreyknvl@google.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel+bounces-6048-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; 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 08/21] kasan: clean up __kasan_mempool_poison_object Date: Tue, 19 Dec 2023 23:28:52 +0100 Message-Id: <4f6fc8840512286c1a96e16e86901082c671677d.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>

Reorganize the code and reword the comment in
__kasan_mempool_poison_object to improve the code readability.

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

diff mbox series

Patch

diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 7ebc001d0fcd..3f4a1ed69e03 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -457,27 +457,22 @@  void __kasan_mempool_unpoison_pages(struct page *page, unsigned int order,
 
 bool __kasan_mempool_poison_object(void *ptr, unsigned long ip)
 {
-	struct folio *folio;
-
-	folio = virt_to_folio(ptr);
+	struct folio *folio = virt_to_folio(ptr);
+	struct slab *slab;
 
 	/*
-	 * Even though this function is only called for kmem_cache_alloc and
-	 * kmalloc backed mempool allocations, those allocations can still be
-	 * !PageSlab() when the size provided to kmalloc is larger than
-	 * KMALLOC_MAX_SIZE, and kmalloc falls back onto page_alloc.
+	 * This function can be called for large kmalloc allocation that get
+	 * their memory from page_alloc. Thus, the folio might not be a slab.
 	 */
 	if (unlikely(!folio_test_slab(folio))) {
 		if (check_page_allocation(ptr, ip))
 			return false;
 		kasan_poison(ptr, folio_size(folio), KASAN_PAGE_FREE, false);
 		return true;
-	} else {
-		struct slab *slab = folio_slab(folio);
-
-		return !____kasan_slab_free(slab->slab_cache, ptr, ip,
-						false, false);
 	}
+
+	slab = folio_slab(folio);
+	return !____kasan_slab_free(slab->slab_cache, ptr, ip, false, false);
 }
 
 void __kasan_mempool_unpoison_object(void *ptr, size_t size, unsigned long ip)