skbuff-use-mempool-kasan-hooks.patch removed from -mm tree
The quilt patch titled
Subject: skbuff: use mempool KASAN hooks
has been removed from the -mm tree. Its filename was
skbuff-use-mempool-kasan-hooks.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: skbuff: use mempool KASAN hooks
Date: Tue, 19 Dec 2023 23:29:04 +0100
Instead of using slab-internal KASAN hooks for poisoning and unpoisoning cached objects, use the proper mempool KASAN hooks.
Also check the return value of kasan_mempool_poison_object to prevent double-free and invali-free bugs.
---
net/core/skbuff.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/core/skbuff.c renamed from net/core/skbuff.c~skbuff-use-mempool-kasan-hooks +6 -4
@@ -337,7 +337,7 @@ static struct sk_buff *napi_skb_cache_ge } skb = nc->skb_cache[--nc->skb_count]; -kasan_unpoison_new_object (skbuff_cache, skb); +kasan_mempool_unpoison_object (skb,kmem_cache_size (skbuff_cache));return skb; }
@@ -1309,13 +1309,15 @@ static void napi_skb_cache_put(struct skstruct napi_alloc_cache *nc =this_cpu_ptr (&napi_alloc_cache);u32 i; -kasan_poison_new_object (skbuff_cache, skb); +if (!kasan_mempool_poison_object (skb)) +return ; + nc->skb_cache[nc->skb_count++] = skb;if (unlikely (nc->skb_count ==NAPI_SKB_CACHE_SIZE )) {for (i =NAPI_SKB_CACHE_HALF ; i <NAPI_SKB_CACHE_SIZE ; i++) -kasan_unpoison_new_object (skbuff_cache, - nc->skb_cache[i]); +kasan_mempool_unpoison_object (nc->skb_cache[i], +kmem_cache_size (skbuff_cache));kmem_cache_free_bulk (skbuff_cache,NAPI_SKB_CACHE_HALF , nc->skb_cache +NAPI_SKB_CACHE_HALF );
_
Patches currently in -mm which might be from [email protected] are
kasan-stop-leaking-stack-trace-handles.patch