KASAN reported an error while executing accept-reust.t testcase
Subsystems (7)
Hi all,
When I run the testcase liburing/accept-reust.t with CONFIG_KASAN=y and CONFIG_KASAN_EXTRA_INFO=y, I got a error reported by KASAN:
Unable to handle kernel paging request at virtual address 00000c6455008008
Mem abort info:
ESR = 0x0000000096000004
EC = 0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC = 0x04: level 0 translation fault
Data abort info:
ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
CM = 0, WnR = 0, TnD = 0, TagAccess = 0
GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
user pgtable: 4k pages, 48-bit VAs, pgdp=00000001104c5000 [00000c6455008008] pgd=0000000000000000, p4d=0000000000000000
Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP Modules linked in: CPU: 6 UID: 0 PID: 352 Comm: kworker/u128:5 Not tainted 6.13.0-rc6-g0a2cb793507d #5 Hardware name: linux,dummy-virt (DT) Workqueue: iou_exit io_ring_exit_work pstate: 10000005 (nzcV daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __kasan_mempool_unpoison_object+0x38/0x170 lr : io_netmsg_cache_free+0x8c/0x180
sp : ffff800083297a90
x29: ffff800083297a90 x28: ffffd4d7f67e88e4 x27: 0000000000000003
x26: 1fffe5958011502e x25: ffff2cabff976c18 x24: 1fffe5957ff2ed83
x23: ffff2cabff976c10 x22: 00000c6455008000 x21: 0002992540200001
x20: 0000000000000000 x19: 00000c6455008000 x18: 00000000489683f8
x17: ffffd4d7f68006ac x16: ffffd4d7f67eb3e0 x15: ffffd4d7f67e88e4
x14: ffffd4d7f766deac x13: ffffd4d7f6619030 x12: ffff7a9b012e3e26
x11: 1ffffa9b012e3e25 x10: ffff7a9b012e3e25 x9 : ffffd4d7f766debc x8 : ffffd4d80971f128 x7 : 0000000000000001 x6 : 00008564fed1c1db x5 : ffffd4d80971f128 x4 : ffff7a9b012e3e26 x3 : ffff2cabff976c00 x2 : ffffc1ffc0000000 x1 : 0000000000000000 x0 : 0002992540200001
Call trace: __kasan_mempool_unpoison_object+0x38/0x170 (P) io_netmsg_cache_free+0x8c/0x180 io_ring_exit_work+0xd4c/0x13a0 process_one_work+0x52c/0x1000 worker_thread+0x830/0xdc0 kthread+0x2bc/0x348 ret_from_fork+0x10/0x20 Code: aa0003f5 aa0103f4 8b131853 aa1303f6 (f9400662) ---[ end trace 0000000000000000 ]---
I preliminary analyzed the accept and connect code logic. In the accept-reuse.t testcase, kmsg->free_iov is not used, so when calling io_netmsg_cache_free(), the kasan_mempool_unpoison_object(kmsg->free_iov...) path should not be executed.
I used the hardware watchpoint to capture the first scene of modifying kmsg->free_iov:
Thread 3 hit Hardware watchpoint 7: *0xffff0000ebfc5410
Old value = 0
New value = -211812350kasan_set_track (stack=<optimized out>, track=<optimized out>) at ./arch/arm64/include/asm/current.h:21
21 return (struct task_struct *)sp_el0;
# bt kasan_set_track kasan_save_track kasan_save_free_info poison_slab_object __kasan_mempool_poison_object kasan_mempool_poison_object io_alloc_cache_put io_netmsg_recycle io_req_msg_cleanup io_connect io_issue_sqe io_queue_sqe io_req_task_submit ...
It's a bit strange. It was modified by KASAN. I can't understand this. Maybe I missed something? Please let me know. Thanks.
---
Li Zetao
Jens Axboe
maintainerQuoted 4 lines · lizetao
Hi all,
When I run the testcase liburing/accept-reust.t with
CONFIG_KASAN=yandCONFIG_KASAN_EXTRA_INFO=y, I got a error reported by KASAN:
Looks more like you get KASAN crashing...
Quoted 76 lines
Unable to handle kernel paging request at virtual address 00000c6455008008Mem abort info:
ESR =0x0000000096000004
EC =0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC =0x04: level 0 translation fault
Data abort info:
ISV = 0, ISS =0x00000004, ISS2 =0x00000000
CM = 0, WnR = 0, TnD = 0, TagAccess = 0
GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
user pgtable: 4k pages, 48-bit VAs, pgdp=00000001104c5000 [00000c6455008008] pgd=0000000000000000, p4d=0000000000000000Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP Modules linked in: CPU: 6 UID: 0 PID: 352 Comm: kworker/u128:5 Not tainted 6.13.0-rc6-g0a2cb793507d #5 Hardware name: linux,dummy-virt (DT) Workqueue: iou_exit io_ring_exit_work pstate: 10000005 (nzcV daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __kasan_mempool_unpoison_object+0x38/0x170 lr : io_netmsg_cache_free+0x8c/0x180sp :
ffff800083297a90
x29:ffff800083297a90x28:ffffd4d7f67e88e4x27: 0000000000000003
x26:1fffe5958011502ex25:ffff2cabff976c18x24:1fffe5957ff2ed83
x23:ffff2cabff976c10x22:00000c6455008000x21: 0002992540200001
x20: 0000000000000000 x19:00000c6455008000x18:00000000489683f8
x17:ffffd4d7f68006acx16:ffffd4d7f67eb3e0x15:ffffd4d7f67e88e4
x14:ffffd4d7f766deacx13:ffffd4d7f6619030x12:ffff7a9b012e3e26
x11:1ffffa9b012e3e25x10:ffff7a9b012e3e25x9 :ffffd4d7f766debcx8 :ffffd4d80971f128x7 : 0000000000000001 x6 :00008564fed1c1dbx5 :ffffd4d80971f128x4 :ffff7a9b012e3e26x3 :ffff2cabff976c00x2 :ffffc1ffc0000000x1 : 0000000000000000 x0 : 0002992540200001Call trace: __kasan_mempool_unpoison_object+0x38/0x170 (P) io_netmsg_cache_free+0x8c/0x180 io_ring_exit_work+0xd4c/0x13a0 process_one_work+0x52c/0x1000 worker_thread+0x830/0xdc0 kthread+0x2bc/0x348 ret_from_fork+0x10/0x20 Code: aa0003f5 aa0103f4 8b131853 aa1303f6 (f9400662) ---[ end trace 0000000000000000 ]---I preliminary analyzed the accept and connect code logic. In the accept-reuse.t testcase,
kmsg->free_iovis not used, so when callingio_netmsg_cache_free(), thekasan_mempool_unpoison_object(kmsg->free_iov...)path should not be executed.I used the hardware watchpoint to capture the first scene of modifying
kmsg->free_iov:Thread 3 hit Hardware watchpoint 7: *0xffff0000ebfc5410
Old value = 0
New value = -211812350kasan_set_track(stack=<optimized out>, track=<optimized out>) at./arch/arm64/include/asm/current.h:21
21 return (structtask_struct*)sp_el0;# bt kasan_set_track kasan_save_track kasan_save_free_info poison_slab_object __kasan_mempool_poison_object kasan_mempool_poison_object io_alloc_cache_put io_netmsg_recycle io_req_msg_cleanup io_connect io_issue_sqe io_queue_sqe io_req_task_submit ...
Quoted 2 lines
It's a bit strange. It was modified by KASAN. I can't understand this. Maybe I missed something? Please let me know. Thanks.
Looks like KASAN with the extra info ends up writing to io_async_msghdr->free_iov somehow. No idea... For the test case in question, ->free_iov should be NULL when initially allocated, and the io_uring code isn't storing to it. Yet it's non-NULL when you later go and free it, after calling kasan_mempool_poison_object().
Signature · 1 line
Jens Axboe
Hi,
Quoted 89 lines
-----Original Message-----
From: Jens Axboe <[email protected]>
Sent: Sunday, January 12, 2025 1:13 AM
To: lizetao <[email protected]>; io-uring <[email protected]>
Cc: Pavel Begunkov <[email protected]>
Subject: Re: KASAN reported an error while executing accept-reust.t testcaseQuoted 4 lines · lizetao
Hi all,
When I run the testcase liburing/accept-reust.t with
CONFIG_KASAN=yandCONFIG_KASAN_EXTRA_INFO=y, I got a error reported by KASAN:Looks more like you get KASAN crashing...
Quoted 74 lines
Unable to handle kernel paging request at virtual address
00000c6455008008Mem abort info:
ESR =0x0000000096000004
EC =0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC =0x04: level 0 translation fault Data abort info:
ISV = 0, ISS =0x00000004, ISS2 =0x00000000
CM = 0, WnR = 0, TnD = 0, TagAccess = 0
GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 user pgtable: 4k pages,
48-bit VAs, pgdp=00000001104c5000 [00000c6455008008] pgd=0000000000000000, p4d=0000000000000000 Internal error: Oops:
0000000096000004 [#1] PREEMPT SMP Modules linked in:CPU: 6 UID: 0 PID: 352 Comm: kworker/u128:5 Not tainted 6.13.0-rc6-g0a2cb793507d #5 Hardware name: linux,dummy-virt (DT) Workqueue: iou_exit io_ring_exit_work pstate: 10000005 (nzcV daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __kasan_mempool_unpoison_object+0x38/0x170 lr : io_netmsg_cache_free+0x8c/0x180sp :
ffff800083297a90
x29:ffff800083297a90x28:ffffd4d7f67e88e4x27: 0000000000000003
x26:1fffe5958011502ex25:ffff2cabff976c18x24:1fffe5957ff2ed83
x23:ffff2cabff976c10x22:00000c6455008000x21: 0002992540200001
x20: 0000000000000000 x19:00000c6455008000x18:00000000489683f8
x17:ffffd4d7f68006acx16:ffffd4d7f67eb3e0x15:ffffd4d7f67e88e4
x14:ffffd4d7f766deacx13:ffffd4d7f6619030x12:ffff7a9b012e3e26
x11:1ffffa9b012e3e25x10:ffff7a9b012e3e25x9 :ffffd4d7f766debcx8 :ffffd4d80971f128x7 : 0000000000000001 x6 :00008564fed1c1dbx5 :ffffd4d80971f128x4 :ffff7a9b012e3e26x3 :ffff2cabff976c00x2 :ffffc1ffc0000000x1 : 0000000000000000 x0 : 0002992540200001 Call trace:__kasan_mempool_unpoison_object+0x38/0x170 (P) io_netmsg_cache_free+0x8c/0x180 io_ring_exit_work+0xd4c/0x13a0 process_one_work+0x52c/0x1000 worker_thread+0x830/0xdc0 kthread+0x2bc/0x348 ret_from_fork+0x10/0x20 Code: aa0003f5 aa0103f4 8b131853 aa1303f6 (f9400662) ---[ end trace0000000000000000 ]---
I preliminary analyzed the accept and connect code logic. In the accept-reuse.t testcase,
kmsg->free_iovis not used, so when callingio_netmsg_cache_free(), thekasan_mempool_unpoison_object(kmsg->free_iov...)path should not be executed.I used the hardware watchpoint to capture the first scene of modifying kmsg-
free_iov:Thread 3 hit Hardware watchpoint 7: *0xffff0000ebfc5410 Old value = 0 New value = -211812350
kasan_set_track(stack=<optimized out>, track=<optimized out>) at./arch/arm64/include/asm/current.h:21
21 return (structtask_struct*)sp_el0;# bt kasan_set_track kasan_save_track kasan_save_free_info poison_slab_object __kasan_mempool_poison_object kasan_mempool_poison_object io_alloc_cache_put io_netmsg_recycle io_req_msg_cleanup io_connect io_issue_sqe io_queue_sqe io_req_task_submit ...
Quoted 8 lines
Quoted 2 lines
It's a bit strange. It was modified by KASAN. I can't understand this. Maybe I missed something? Please let me know. Thanks.
Looks like KASAN with the extra info ends up writing to io_async_msghdr-
Quoted 1 line
free_iovsomehow. No idea... For the test case in question, ->free_iov shouldbe NULL when initially allocated, and the
io_uringcode isn't storing to it. Yet it's non-NULL when you later go and free it, after callingkasan_mempool_poison_object().
I also think so and would Juntong and Ryabinin or others KASAN developers be interested In this problem?
+CC [email protected], [email protected] and [email protected]
Thank you so mush.
Quoted 3 lines
--
Jens Axboe
---
Li Zetao
Andrey Ryabinin
maintainerQuoted 95 lines · lizetao
Hi,
Quoted 92 lines
-----Original Message-----
From: Jens Axboe <[email protected]>
Sent: Sunday, January 12, 2025 1:13 AM
To: lizetao <[email protected]>; io-uring <[email protected]>
Cc: Pavel Begunkov <[email protected]>
Subject: Re: KASAN reported an error while executing accept-reust.t testcaseQuoted 4 lines · lizetao
Hi all,
When I run the testcase liburing/accept-reust.t with
CONFIG_KASAN=yandCONFIG_KASAN_EXTRA_INFO=y, I got a error reported by KASAN:Looks more like you get KASAN crashing...
Quoted 76 lines
Unable to handle kernel paging request at virtual address
00000c6455008008Mem abort info:
ESR =0x0000000096000004
EC =0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC =0x04: level 0 translation fault Data abort info:
ISV = 0, ISS =0x00000004, ISS2 =0x00000000
CM = 0, WnR = 0, TnD = 0, TagAccess = 0
GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 user pgtable: 4k pages,
48-bit VAs, pgdp=00000001104c5000 [00000c6455008008] pgd=0000000000000000, p4d=0000000000000000 Internal error: Oops:
0000000096000004 [#1] PREEMPT SMP Modules linked in:CPU: 6 UID: 0 PID: 352 Comm: kworker/u128:5 Not tainted 6.13.0-rc6-g0a2cb793507d #5 Hardware name: linux,dummy-virt (DT) Workqueue: iou_exit io_ring_exit_work pstate: 10000005 (nzcV daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __kasan_mempool_unpoison_object+0x38/0x170 lr : io_netmsg_cache_free+0x8c/0x180sp :
ffff800083297a90
x29:ffff800083297a90x28:ffffd4d7f67e88e4x27: 0000000000000003
x26:1fffe5958011502ex25:ffff2cabff976c18x24:1fffe5957ff2ed83
x23:ffff2cabff976c10x22:00000c6455008000x21: 0002992540200001
x20: 0000000000000000 x19:00000c6455008000x18:00000000489683f8
x17:ffffd4d7f68006acx16:ffffd4d7f67eb3e0x15:ffffd4d7f67e88e4
x14:ffffd4d7f766deacx13:ffffd4d7f6619030x12:ffff7a9b012e3e26
x11:1ffffa9b012e3e25x10:ffff7a9b012e3e25x9 :ffffd4d7f766debcx8 :ffffd4d80971f128x7 : 0000000000000001 x6 :00008564fed1c1dbx5 :ffffd4d80971f128x4 :ffff7a9b012e3e26x3 :ffff2cabff976c00x2 :ffffc1ffc0000000x1 : 0000000000000000 x0 : 0002992540200001 Call trace:__kasan_mempool_unpoison_object+0x38/0x170 (P) io_netmsg_cache_free+0x8c/0x180 io_ring_exit_work+0xd4c/0x13a0 process_one_work+0x52c/0x1000 worker_thread+0x830/0xdc0 kthread+0x2bc/0x348 ret_from_fork+0x10/0x20 Code: aa0003f5 aa0103f4 8b131853 aa1303f6 (f9400662) ---[ end trace0000000000000000 ]---
I preliminary analyzed the accept and connect code logic. In the accept-reuse.t testcase,
kmsg->free_iovis not used, so when callingio_netmsg_cache_free(), thekasan_mempool_unpoison_object(kmsg->free_iov...)path should not be executed.I used the hardware watchpoint to capture the first scene of modifying kmsg-
free_iov:Thread 3 hit Hardware watchpoint 7: *0xffff0000ebfc5410 Old value = 0 New value = -211812350
kasan_set_track(stack=<optimized out>, track=<optimized out>) at./arch/arm64/include/asm/current.h:21
21 return (structtask_struct*)sp_el0;# bt kasan_set_track kasan_save_track kasan_save_free_info poison_slab_object __kasan_mempool_poison_object kasan_mempool_poison_object io_alloc_cache_put io_netmsg_recycle io_req_msg_cleanup io_connect io_issue_sqe io_queue_sqe io_req_task_submit ...It's a bit strange. It was modified by KASAN. I can't understand this. Maybe I missed something? Please let me know. Thanks.
Quoted 9 lines
Quoted 5 lines
Looks like KASAN with the extra info ends up writing to io_async_msghdr-
Quoted 1 line
free_iovsomehow. No idea... For the test case in question, ->free_iov shouldbe NULL when initially allocated, and the
io_uringcode isn't storing to it. Yet it's non-NULL when you later go and free it, after callingkasan_mempool_poison_object().I also think so and would Juntong and Ryabinin or others KASAN developers be interested In this problem?
Hi, thanks for reporting.
KASAN stores some info about freed slab object in the object itself until it is reallocated or the slab page is released.
And since the b556a462eb8d ("kasan: save free stack traces for slab mempools") we do the same thing in kasan_mempool_poison_object(). In the most use cases this wasn't the problem, because callers expect uninitialized objects from mempool.
However, this isn't the case for io_alloc_cache. AFAICS io_uring code expects that io_alloc_cache_put/get leaves objects unmodified. So I'm thinking we'd need to add some parameter to the kasan_mempool_poison_object() to avoid modifying objects.
Andrey Ryabinin
maintainerPATCH 1/1 kasan, mempool: don't store free stacktrace in io_alloc_cache objects.
Running the testcase liburing/accept-reust.t with CONFIG_KASAN=y and CONFIG_KASAN_EXTRA_INFO=y leads to the following crash:
Unable to handle kernel paging request at virtual address 00000c6455008008
...
pc : __kasan_mempool_unpoison_object+0x38/0x170
lr : io_netmsg_cache_free+0x8c/0x180
...
Call trace:
__kasan_mempool_unpoison_object+0x38/0x170 (P)
io_netmsg_cache_free+0x8c/0x180
io_ring_exit_work+0xd4c/0x13a0
process_one_work+0x52c/0x1000
worker_thread+0x830/0xdc0
kthread+0x2bc/0x348
ret_from_fork+0x10/0x20Since the commit b556a462eb8d ("kasan: save free stack traces for slab mempools") kasan_mempool_poison_object() stores some info inside an object.
It was expected that the object must be reinitialized after kasan_mempool_unpoison_object() call, and this is what happens in the most of use cases.
However io_uring code expects that io_alloc_cache_put/get doesn't modify the object, so kasan_mempool_poison_object() end up corrupting it leading to crash later.
Add @notrack argument to kasan_mempool_poison_object() call to tell KASAN to avoid storing info in objects for io_uring use case.
--- include/linux/kasan.h | 13 +++++++------ io_uring/alloc_cache.h | 2 +- io_uring/net.c | 2 +- io_uring/rw.c | 2 +- mm/kasan/common.c | 11 ++++++----- mm/mempool.c | 2 +- net/core/skbuff.c | 2 +- 7 files changed, 18 insertions(+), 16 deletions(-)
include/linux/kasan.h +7 -6
@@ -328,18 +328,19 @@ static __always_inline void kasan_mempool_unpoison_pages(struct page *page,__kasan_mempool_unpoison_pages (page, order, _RET_IP_); } -bool __kasan_mempool_poison_object (void *ptr,unsigned long ip); +bool __kasan_mempool_poison_object (void *ptr,bool notrack,unsigned long ip);/** * kasan_mempool_poison_object - Check and poison a mempool slab allocation. * @ptr: Pointer to the slab allocation. +* @notrack: Don't record stack trace of this call in the object. * * This function is intended for kernel subsystems that cache slab allocations * to reuse them instead of freeing them back to the slab allocator (e.g. * mempool). * * This function poisons a slab allocation and saves a free stack trace for it -* without initializing the allocation's memory and without putting it into the -* quarantine (for the Generic mode). +* (if @notrack == false) without initializing the allocation's memory and +* without putting it into the quarantine (for the Generic mode). * * This function also performs checks to detect double-free and invalid-free * bugs and reports them. The caller can use the return value of this function
@@ -354,10 +355,10 @@ bool __kasan_mempool_poison_object(void *ptr, unsigned long ip);* * Return: true if the allocation can be safely reused; false otherwise. */ -static __always_inline bool kasan_mempool_poison_object(void *ptr) +static __always_inline bool kasan_mempool_poison_object(void *ptr, bool notrack) {if (kasan_enabled ()) -return __kasan_mempool_poison_object (ptr, _RET_IP_); +return __kasan_mempool_poison_object (ptr, notrack, _RET_IP_);return true; }
@@ -456,7 +457,7 @@ static inline bool kasan_mempool_poison_pages(struct page *page, unsigned int orreturn true; }static inline void kasan_mempool_unpoison_pages (struct page *page,unsigned int order) {} -static inline bool kasan_mempool_poison_object (void *ptr) +static inline bool kasan_mempool_poison_object (void *ptr,bool notrack) {return true; }
io_uring/alloc_cache.h +1 -1
@@ -10,7 +10,7 @@ static inline bool io_alloc_cache_put(struct io_alloc_cache *cache, void *entry) {if (cache->nr_cached < cache->max_cached) { -if (!kasan_mempool_poison_object (entry)) +if (!kasan_mempool_poison_object (entry, true))return false; cache->entries[cache->nr_cached++] = entry;return true;
io_uring/net.c +1 -1
@@ -149,7 +149,7 @@ static void io_netmsg_recycle(struct io_kiocb *req, unsigned int issue_flags) iov = hdr->free_iov;if (io_alloc_cache_put (&req->ctx->netmsg_cache, hdr)) {if (iov) -kasan_mempool_poison_object (iov); +kasan_mempool_poison_object (iov, true); req->async_data =NULL ; req->flags &= ~REQ_F_ASYNC_DATA ; }
io_uring/rw.c +1 -1
@@ -167,7 +167,7 @@ static void io_rw_recycle(struct io_kiocb *req, unsigned int issue_flags) iov = rw->free_iovec;if (io_alloc_cache_put (&req->ctx->rw_cache, rw)) {if (iov) -kasan_mempool_poison_object (iov); +kasan_mempool_poison_object (iov, true); req->async_data =NULL ; req->flags &= ~REQ_F_ASYNC_DATA ; }
mm/kasan/common.c +6 -5
@@ -230,7 +230,8 @@ static bool check_slab_allocation(struct kmem_cache *cache, void *object, }static inline void poison_slab_object (struct kmem_cache *cache,void *object, -bool init,bool still_accessible) +bool init,bool still_accessible, +bool notrack) {void *tagged_object = object;
@@ -243,7 +244,7 @@ static inline void poison_slab_object(struct kmem_cache *cache, void *object,kasan_poison (object,round_up (cache->object_size,KASAN_GRANULE_SIZE ),KASAN_SLAB_FREE , init); -if (kasan_stack_collection_enabled ()) +if (kasan_stack_collection_enabled () && !notrack)kasan_save_free_info (cache, tagged_object); }
@@ -261,7 +262,7 @@ bool __kasan_slab_free(struct kmem_cache *cache, void *object, bool init,if (!kasan_arch_is_ready () ||is_kfence_address (object))return false; -poison_slab_object (cache, object, init, still_accessible); +poison_slab_object (cache, object, init, still_accessible, true);/* * If the object is put into quarantine, do not let slab put the object
@@ -495,7 +496,7 @@ void __kasan_mempool_unpoison_pages(struct page *page, unsigned int order,__kasan_unpoison_pages (page, order, false); } -bool __kasan_mempool_poison_object (void *ptr,unsigned long ip) +bool __kasan_mempool_poison_object (void *ptr,bool notrack,unsigned long ip) {struct folio *folio =virt_to_folio (ptr);struct slab *slab;
@@ -519,7 +520,7 @@ bool __kasan_mempool_poison_object(void *ptr, unsigned long ip)if (check_slab_allocation (slab->slab_cache, ptr, ip))return false; -poison_slab_object (slab->slab_cache, ptr, false, false); +poison_slab_object (slab->slab_cache, ptr, false, false, notrack);return true; }
mm/mempool.c +1 -1
@@ -115,7 +115,7 @@ static inline void 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) -return kasan_mempool_poison_object (element); +return kasan_mempool_poison_object (element, false);else if (pool->alloc == mempool_alloc_pages)return kasan_mempool_poison_pages (element, (unsigned long )pool->pool_data);
net/core/skbuff.c +1 -1
@@ -1457,7 +1457,7 @@ static void napi_skb_cache_put(struct sk_buff *skb)struct napi_alloc_cache *nc =this_cpu_ptr (&napi_alloc_cache);u32 i; -if (!kasan_mempool_poison_object (skb)) +if (!kasan_mempool_poison_object (skb, false))return ;local_lock_nested_bh (&napi_alloc_cache.bh_lock);
Signature · 1 line
2.45.3
Andrey Konovalov
reviewerRe: [PATCH] kasan, mempool: don't store free stacktrace in io_alloc_cache objects.
Quoted 169 lines · Andrey Ryabinin
Running the testcase liburing/accept-reust.t with
CONFIG_KASAN=yandCONFIG_KASAN_EXTRA_INFO=yleads to the following crash:Unable to handle kernel paging request at virtual address 00000c6455008008 ... pc : __kasan_mempool_unpoison_object+0x38/0x170 lr : io_netmsg_cache_free+0x8c/0x180 ... Call trace: __kasan_mempool_unpoison_object+0x38/0x170 (P) io_netmsg_cache_free+0x8c/0x180 io_ring_exit_work+0xd4c/0x13a0 process_one_work+0x52c/0x1000 worker_thread+0x830/0xdc0 kthread+0x2bc/0x348 ret_from_fork+0x10/0x20Since the commit
b556a462eb8d("kasan: save free stack traces for slab mempools")kasan_mempool_poison_object()stores some info inside an object.
It was expected that the object must be reinitialized afterkasan_mempool_unpoison_object()call, and this is what happens in the most of use cases.However
io_uringcode expects that io_alloc_cache_put/get doesn't modify the object, sokasan_mempool_poison_object()end up corrupting it leading to crash later.Add @notrack argument to
kasan_mempool_poison_object()call to tell KASAN to avoid storing info in objects forio_uringuse case.Reported-by lizetao <[email protected]>Fixes b556a462eb8d ("kasan: save free stack traces for slab mempools")Cc Alexander Potapenko <[email protected]>Cc Andrey Konovalov <[email protected]>Cc Dmitry Vyukov <[email protected]>Cc Vincenzo Frascino <[email protected]>Cc Jens Axboe <[email protected]>Cc Pavel Begunkov <[email protected]>Cc "David S. Miller" <[email protected]>Cc Eric Dumazet <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>Cc Simon Horman <[email protected]>Signed-off-by Andrey Ryabinin <[email protected]>--- include/linux/kasan.h | 13 +++++++------ io_uring/alloc_cache.h | 2 +- io_uring/net.c | 2 +- io_uring/rw.c | 2 +- mm/kasan/common.c | 11 ++++++----- mm/mempool.c | 2 +- net/core/skbuff.c | 2 +- 7 files changed, 18 insertions(+), 16 deletions(-)include/linux/kasan.h +7
-6@@ -328,18 +328,19 @@ static __always_inline void kasan_mempool_unpoison_pages(struct page *page,__kasan_mempool_unpoison_pages (page, order, _RET_IP_); } -bool __kasan_mempool_poison_object (void *ptr,unsigned long ip); +bool __kasan_mempool_poison_object (void *ptr,bool notrack,unsigned long ip);/** * kasan_mempool_poison_object - Check and poison a mempool slab allocation. * @ptr: Pointer to the slab allocation. +* @notrack: Don't record stack trace of this call in the object. * * This function is intended for kernel subsystems that cache slab allocations * to reuse them instead of freeing them back to the slab allocator (e.g. * mempool). * * This function poisons a slab allocation and saves a free stack trace for it -* without initializing the allocation's memory and without putting it into the -* quarantine (for the Generic mode). +* (if @notrack == false) without initializing the allocation's memory and +* without putting it into the quarantine (for the Generic mode). * * This function also performs checks to detect double-free and invalid-free * bugs and reports them. The caller can use the return value of this function @@ -354,10 +355,10 @@ bool __kasan_mempool_poison_object(void *ptr, unsigned long ip);* * Return: true if the allocation can be safely reused; false otherwise. */ -static __always_inline bool kasan_mempool_poison_object(void *ptr) +static __always_inline bool kasan_mempool_poison_object(void *ptr, bool notrack) {if (kasan_enabled ()) -return __kasan_mempool_poison_object (ptr, _RET_IP_); +return __kasan_mempool_poison_object (ptr, notrack, _RET_IP_);return true; }@@ -456,7 +457,7 @@ static inline bool kasan_mempool_poison_pages(struct page *page, unsigned int orreturn true; }static inline void kasan_mempool_unpoison_pages (struct page *page,unsigned int order) {} -static inline bool kasan_mempool_poison_object (void *ptr) +static inline bool kasan_mempool_poison_object (void *ptr,bool notrack) {return true; }io_uring/alloc_cache.h +1
-1@@ -10,7 +10,7 @@ static inline bool io_alloc_cache_put(struct io_alloc_cache *cache, void *entry) {if (cache->nr_cached < cache->max_cached) { -if (!kasan_mempool_poison_object (entry)) +if (!kasan_mempool_poison_object (entry, true))return false; cache->entries[cache->nr_cached++] = entry;return true;io_uring/net.c +1
-1@@ -149,7 +149,7 @@ static void io_netmsg_recycle(struct io_kiocb *req, unsigned int issue_flags) iov = hdr->free_iov;if (io_alloc_cache_put (&req->ctx->netmsg_cache, hdr)) {if (iov) -kasan_mempool_poison_object (iov); +kasan_mempool_poison_object (iov, true); req->async_data =NULL ; req->flags &= ~REQ_F_ASYNC_DATA ; }io_uring/rw.c +1
-1@@ -167,7 +167,7 @@ static void io_rw_recycle(struct io_kiocb *req, unsigned int issue_flags) iov = rw->free_iovec;if (io_alloc_cache_put (&req->ctx->rw_cache, rw)) {if (iov) -kasan_mempool_poison_object (iov); +kasan_mempool_poison_object (iov, true); req->async_data =NULL ; req->flags &= ~REQ_F_ASYNC_DATA ; }mm/kasan/common.c +3
-2@@ -230,7 +230,8 @@ static bool check_slab_allocation(struct kmem_cache *cache, void *object, }static inline void poison_slab_object (struct kmem_cache *cache,void *object, -bool init,bool still_accessible) +bool init,bool still_accessible, +bool notrack) {void *tagged_object = object;@@ -243,7 +244,7 @@ static inline void poison_slab_object(struct kmem_cache *cache, void *object,kasan_poison (object,round_up (cache->object_size,KASAN_GRANULE_SIZE ),KASAN_SLAB_FREE , init); -if (kasan_stack_collection_enabled ()) +if (kasan_stack_collection_enabled () && !notrack)kasan_save_free_info (cache, tagged_object); }
mm/kasan/common.c bool __kasan_slab_free(struct kmem_cache *cache, void *object, bool init, · line 265
Quoted 5 lines
mm/kasan/common.c +1
-1@@ -261,7 +262,7 @@ bool __kasan_slab_free(struct kmem_cache *cache, void *object, bool init,if (!kasan_arch_is_ready () ||is_kfence_address (object))return false; -poison_slab_object (cache, object, init, still_accessible); +poison_slab_object (cache, object, init, still_accessible, true);
Should notrack be false here?
Quoted 50 lines
mm/kasan/common.c +2
-2/* * If the object is put into quarantine, do not let slab put the object @@ -495,7 +496,7 @@ void __kasan_mempool_unpoison_pages(struct page *page, unsigned int order,__kasan_unpoison_pages (page, order, false); } -bool __kasan_mempool_poison_object (void *ptr,unsigned long ip) +bool __kasan_mempool_poison_object (void *ptr,bool notrack,unsigned long ip) {struct folio *folio =virt_to_folio (ptr);struct slab *slab;@@ -519,7 +520,7 @@ bool __kasan_mempool_poison_object(void *ptr, unsigned long ip)if (check_slab_allocation (slab->slab_cache, ptr, ip))return false; -poison_slab_object (slab->slab_cache, ptr, false, false); +poison_slab_object (slab->slab_cache, ptr, false, false, notrack);return true; }mm/mempool.c +1
-1@@ -115,7 +115,7 @@ static inline void 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) -return kasan_mempool_poison_object (element); +return kasan_mempool_poison_object (element, false);else if (pool->alloc == mempool_alloc_pages)return kasan_mempool_poison_pages (element, (unsigned long )pool->pool_data);net/core/skbuff.c +1
-2@@ -1457,7 +1457,7 @@ static void napi_skb_cache_put(struct sk_buff *skb)struct napi_alloc_cache *nc =this_cpu_ptr (&napi_alloc_cache);u32 i; -if (!kasan_mempool_poison_object (skb)) +if (!kasan_mempool_poison_object (skb, false))return ;local_lock_nested_bh (&napi_alloc_cache.bh_lock); --2.45.3
Andrey Ryabinin
maintainerRe: [PATCH] kasan, mempool: don't store free stacktrace in io_alloc_cache objects.
Quoted 12 lines · Andrey Konovalov
mm/kasan/common.c bool __kasan_slab_free(struct kmem_cache *cache, void *object, bool init, · line 265
Quoted 6 lines · Andrey Ryabinin
mm/kasan/common.c +1
-1@@ -261,7 +262,7 @@ bool __kasan_slab_free(struct kmem_cache *cache, void *object, bool init,if (!kasan_arch_is_ready () ||is_kfence_address (object))return false; -poison_slab_object (cache, object, init, still_accessible); +poison_slab_object (cache, object, init, still_accessible, true);Should notrack be false here?
Yep.
Andrey Ryabinin
maintainerPATCH v2 1/1 kasan, mempool: don't store free stacktrace in io_alloc_cache objects.
In reply to Andrey RyabininRunning the testcase liburing/accept-reust.t with CONFIG_KASAN=y and CONFIG_KASAN_EXTRA_INFO=y leads to the following crash:
Unable to handle kernel paging request at virtual address 00000c6455008008
...
pc : __kasan_mempool_unpoison_object+0x38/0x170
lr : io_netmsg_cache_free+0x8c/0x180
...
Call trace:
__kasan_mempool_unpoison_object+0x38/0x170 (P)
io_netmsg_cache_free+0x8c/0x180
io_ring_exit_work+0xd4c/0x13a0
process_one_work+0x52c/0x1000
worker_thread+0x830/0xdc0
kthread+0x2bc/0x348
ret_from_fork+0x10/0x20Since the commit b556a462eb8d ("kasan: save free stack traces for slab mempools") kasan_mempool_poison_object() stores some info inside an object.
It was expected that the object must be reinitialized after kasan_mempool_unpoison_object() call, and this is what happens in the most of use cases.
However io_uring code expects that io_alloc_cache_put/get doesn't modify the object, so kasan_mempool_poison_object() end up corrupting it leading to crash later.
Add @notrack argument to kasan_mempool_poison_object() call to tell KASAN to avoid storing info in objects for io_uring use case.
---
- Changes since v1:
s/true/false @notrack in __kasan_slab_free() per @andreyknvl
include/linux/kasan.h | 13 +++++++------ io_uring/alloc_cache.h | 2 +- io_uring/net.c | 2 +- io_uring/rw.c | 2 +- mm/kasan/common.c | 11 ++++++----- mm/mempool.c | 2 +- net/core/skbuff.c | 2 +- 7 files changed, 18 insertions(+), 16 deletions(-)
include/linux/kasan.h +7 -6
@@ -328,18 +328,19 @@ static __always_inline void kasan_mempool_unpoison_pages(struct page *page,__kasan_mempool_unpoison_pages (page, order, _RET_IP_); } -bool __kasan_mempool_poison_object (void *ptr,unsigned long ip); +bool __kasan_mempool_poison_object (void *ptr,bool notrack,unsigned long ip);/** * kasan_mempool_poison_object - Check and poison a mempool slab allocation. * @ptr: Pointer to the slab allocation. +* @notrack: Don't record stack trace of this call in the object. * * This function is intended for kernel subsystems that cache slab allocations * to reuse them instead of freeing them back to the slab allocator (e.g. * mempool). * * This function poisons a slab allocation and saves a free stack trace for it -* without initializing the allocation's memory and without putting it into the -* quarantine (for the Generic mode). +* (if @notrack == false) without initializing the allocation's memory and +* without putting it into the quarantine (for the Generic mode). * * This function also performs checks to detect double-free and invalid-free * bugs and reports them. The caller can use the return value of this function
@@ -354,10 +355,10 @@ bool __kasan_mempool_poison_object(void *ptr, unsigned long ip);* * Return: true if the allocation can be safely reused; false otherwise. */ -static __always_inline bool kasan_mempool_poison_object(void *ptr) +static __always_inline bool kasan_mempool_poison_object(void *ptr, bool notrack) {if (kasan_enabled ()) -return __kasan_mempool_poison_object (ptr, _RET_IP_); +return __kasan_mempool_poison_object (ptr, notrack, _RET_IP_);return true; }
@@ -456,7 +457,7 @@ static inline bool kasan_mempool_poison_pages(struct page *page, unsigned int orreturn true; }static inline void kasan_mempool_unpoison_pages (struct page *page,unsigned int order) {} -static inline bool kasan_mempool_poison_object (void *ptr) +static inline bool kasan_mempool_poison_object (void *ptr,bool notrack) {return true; }
io_uring/alloc_cache.h +1 -1
@@ -10,7 +10,7 @@ static inline bool io_alloc_cache_put(struct io_alloc_cache *cache, void *entry) {if (cache->nr_cached < cache->max_cached) { -if (!kasan_mempool_poison_object (entry)) +if (!kasan_mempool_poison_object (entry, true))return false; cache->entries[cache->nr_cached++] = entry;return true;
io_uring/net.c +1 -1
@@ -149,7 +149,7 @@ static void io_netmsg_recycle(struct io_kiocb *req, unsigned int issue_flags) iov = hdr->free_iov;if (io_alloc_cache_put (&req->ctx->netmsg_cache, hdr)) {if (iov) -kasan_mempool_poison_object (iov); +kasan_mempool_poison_object (iov, true); req->async_data =NULL ; req->flags &= ~REQ_F_ASYNC_DATA ; }
io_uring/rw.c +1 -1
@@ -167,7 +167,7 @@ static void io_rw_recycle(struct io_kiocb *req, unsigned int issue_flags) iov = rw->free_iovec;if (io_alloc_cache_put (&req->ctx->rw_cache, rw)) {if (iov) -kasan_mempool_poison_object (iov); +kasan_mempool_poison_object (iov, true); req->async_data =NULL ; req->flags &= ~REQ_F_ASYNC_DATA ; }
mm/kasan/common.c +6 -5
@@ -230,7 +230,8 @@ static bool check_slab_allocation(struct kmem_cache *cache, void *object, }static inline void poison_slab_object (struct kmem_cache *cache,void *object, -bool init,bool still_accessible) +bool init,bool still_accessible, +bool notrack) {void *tagged_object = object;
@@ -243,7 +244,7 @@ static inline void poison_slab_object(struct kmem_cache *cache, void *object,kasan_poison (object,round_up (cache->object_size,KASAN_GRANULE_SIZE ),KASAN_SLAB_FREE , init); -if (kasan_stack_collection_enabled ()) +if (kasan_stack_collection_enabled () && !notrack)kasan_save_free_info (cache, tagged_object); }
@@ -261,7 +262,7 @@ bool __kasan_slab_free(struct kmem_cache *cache, void *object, bool init,if (!kasan_arch_is_ready () ||is_kfence_address (object))return false; -poison_slab_object (cache, object, init, still_accessible); +poison_slab_object (cache, object, init, still_accessible, false);/* * If the object is put into quarantine, do not let slab put the object
@@ -495,7 +496,7 @@ void __kasan_mempool_unpoison_pages(struct page *page, unsigned int order,__kasan_unpoison_pages (page, order, false); } -bool __kasan_mempool_poison_object (void *ptr,unsigned long ip) +bool __kasan_mempool_poison_object (void *ptr,bool notrack,unsigned long ip) {struct folio *folio =virt_to_folio (ptr);struct slab *slab;
@@ -519,7 +520,7 @@ bool __kasan_mempool_poison_object(void *ptr, unsigned long ip)if (check_slab_allocation (slab->slab_cache, ptr, ip))return false; -poison_slab_object (slab->slab_cache, ptr, false, false); +poison_slab_object (slab->slab_cache, ptr, false, false, notrack);return true; }
mm/mempool.c +1 -1
@@ -115,7 +115,7 @@ static inline void 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) -return kasan_mempool_poison_object (element); +return kasan_mempool_poison_object (element, false);else if (pool->alloc == mempool_alloc_pages)return kasan_mempool_poison_pages (element, (unsigned long )pool->pool_data);
net/core/skbuff.c +1 -1
@@ -1457,7 +1457,7 @@ static void napi_skb_cache_put(struct sk_buff *skb)struct napi_alloc_cache *nc =this_cpu_ptr (&napi_alloc_cache);u32 i; -if (!kasan_mempool_poison_object (skb)) +if (!kasan_mempool_poison_object (skb, false))return ;local_lock_nested_bh (&napi_alloc_cache.bh_lock);
Signature · 1 line
2.45.3
Re: [PATCH v2] kasan, mempool: don't store free stacktrace in io_alloc_cache objects.
Quoted 225 lines · Andrey Ryabinin
Running the testcase liburing/accept-reust.t with
CONFIG_KASAN=yandCONFIG_KASAN_EXTRA_INFO=yleads to the following crash:Unable to handle kernel paging request at virtual address 00000c6455008008 ... pc : __kasan_mempool_unpoison_object+0x38/0x170 lr : io_netmsg_cache_free+0x8c/0x180 ... Call trace: __kasan_mempool_unpoison_object+0x38/0x170 (P) io_netmsg_cache_free+0x8c/0x180 io_ring_exit_work+0xd4c/0x13a0 process_one_work+0x52c/0x1000 worker_thread+0x830/0xdc0 kthread+0x2bc/0x348 ret_from_fork+0x10/0x20Since the commit
b556a462eb8d("kasan: save free stack traces for slab mempools")kasan_mempool_poison_object()stores some info inside an object.
It was expected that the object must be reinitialized afterkasan_mempool_unpoison_object()call, and this is what happens in the most of use cases.However
io_uringcode expects that io_alloc_cache_put/get doesn't modify the object, sokasan_mempool_poison_object()end up corrupting it leading to crash later.Add @notrack argument to
kasan_mempool_poison_object()call to tell KASAN to avoid storing info in objects forio_uringuse case.Reported-by lizetao <[email protected]>Fixes b556a462eb8d ("kasan: save free stack traces for slab mempools")Cc Alexander Potapenko <[email protected]>Cc Andrey Konovalov <[email protected]>Cc Dmitry Vyukov <[email protected]>Cc Vincenzo Frascino <[email protected]>Cc Jens Axboe <[email protected]>Cc Pavel Begunkov <[email protected]>Cc "David S. Miller" <[email protected]>Cc Eric Dumazet <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Paolo Abeni <[email protected]>Cc Simon Horman <[email protected]>Signed-off-by Andrey Ryabinin <[email protected]>---
- Changes since v1:
s/true/false @notrack in__kasan_slab_free()per @andreyknvlinclude/linux/kasan.h | 13 +++++++------ io_uring/alloc_cache.h | 2 +- io_uring/net.c | 2 +- io_uring/rw.c | 2 +- mm/kasan/common.c | 11 ++++++----- mm/mempool.c | 2 +- net/core/skbuff.c | 2 +- 7 files changed, 18 insertions(+), 16 deletions(-)include/linux/kasan.h +7
-6@@ -328,18 +328,19 @@ static __always_inline void kasan_mempool_unpoison_pages(struct page *page,__kasan_mempool_unpoison_pages (page, order, _RET_IP_); } -bool __kasan_mempool_poison_object (void *ptr,unsigned long ip); +bool __kasan_mempool_poison_object (void *ptr,bool notrack,unsigned long ip);/** * kasan_mempool_poison_object - Check and poison a mempool slab allocation. * @ptr: Pointer to the slab allocation. +* @notrack: Don't record stack trace of this call in the object. * * This function is intended for kernel subsystems that cache slab allocations * to reuse them instead of freeing them back to the slab allocator (e.g. * mempool). * * This function poisons a slab allocation and saves a free stack trace for it -* without initializing the allocation's memory and without putting it into the -* quarantine (for the Generic mode). +* (if @notrack == false) without initializing the allocation's memory and +* without putting it into the quarantine (for the Generic mode). * * This function also performs checks to detect double-free and invalid-free * bugs and reports them. The caller can use the return value of this function @@ -354,10 +355,10 @@ bool __kasan_mempool_poison_object(void *ptr, unsigned long ip);* * Return: true if the allocation can be safely reused; false otherwise. */ -static __always_inline bool kasan_mempool_poison_object(void *ptr) +static __always_inline bool kasan_mempool_poison_object(void *ptr, bool notrack) {if (kasan_enabled ()) -return __kasan_mempool_poison_object (ptr, _RET_IP_); +return __kasan_mempool_poison_object (ptr, notrack, _RET_IP_);return true; }@@ -456,7 +457,7 @@ static inline bool kasan_mempool_poison_pages(struct page *page, unsigned int orreturn true; }static inline void kasan_mempool_unpoison_pages (struct page *page,unsigned int order) {} -static inline bool kasan_mempool_poison_object (void *ptr) +static inline bool kasan_mempool_poison_object (void *ptr,bool notrack) {return true; }io_uring/alloc_cache.h +1
-1@@ -10,7 +10,7 @@ static inline bool io_alloc_cache_put(struct io_alloc_cache *cache, void *entry) {if (cache->nr_cached < cache->max_cached) { -if (!kasan_mempool_poison_object (entry)) +if (!kasan_mempool_poison_object (entry, true))return false; cache->entries[cache->nr_cached++] = entry;return true;io_uring/net.c +1
-1@@ -149,7 +149,7 @@ static void io_netmsg_recycle(struct io_kiocb *req, unsigned int issue_flags) iov = hdr->free_iov;if (io_alloc_cache_put (&req->ctx->netmsg_cache, hdr)) {if (iov) -kasan_mempool_poison_object (iov); +kasan_mempool_poison_object (iov, true); req->async_data =NULL ; req->flags &= ~REQ_F_ASYNC_DATA ; }io_uring/rw.c +1
-1@@ -167,7 +167,7 @@ static void io_rw_recycle(struct io_kiocb *req, unsigned int issue_flags) iov = rw->free_iovec;if (io_alloc_cache_put (&req->ctx->rw_cache, rw)) {if (iov) -kasan_mempool_poison_object (iov); +kasan_mempool_poison_object (iov, true); req->async_data =NULL ; req->flags &= ~REQ_F_ASYNC_DATA ; }mm/kasan/common.c +6
-5@@ -230,7 +230,8 @@ static bool check_slab_allocation(struct kmem_cache *cache, void *object, }static inline void poison_slab_object (struct kmem_cache *cache,void *object, -bool init,bool still_accessible) +bool init,bool still_accessible, +bool notrack) {void *tagged_object = object;@@ -243,7 +244,7 @@ static inline void poison_slab_object(struct kmem_cache *cache, void *object,kasan_poison (object,round_up (cache->object_size,KASAN_GRANULE_SIZE ),KASAN_SLAB_FREE , init); -if (kasan_stack_collection_enabled ()) +if (kasan_stack_collection_enabled () && !notrack)kasan_save_free_info (cache, tagged_object); }@@ -261,7 +262,7 @@ bool __kasan_slab_free(struct kmem_cache *cache, void *object, bool init,if (!kasan_arch_is_ready () ||is_kfence_address (object))return false; -poison_slab_object (cache, object, init, still_accessible); +poison_slab_object (cache, object, init, still_accessible, false);/* * If the object is put into quarantine, do not let slab put the object @@ -495,7 +496,7 @@ void __kasan_mempool_unpoison_pages(struct page *page, unsigned int order,__kasan_unpoison_pages (page, order, false); } -bool __kasan_mempool_poison_object (void *ptr,unsigned long ip) +bool __kasan_mempool_poison_object (void *ptr,bool notrack,unsigned long ip) {struct folio *folio =virt_to_folio (ptr);struct slab *slab;@@ -519,7 +520,7 @@ bool __kasan_mempool_poison_object(void *ptr, unsigned long ip)if (check_slab_allocation (slab->slab_cache, ptr, ip))return false; -poison_slab_object (slab->slab_cache, ptr, false, false); +poison_slab_object (slab->slab_cache, ptr, false, false, notrack);return true; }mm/mempool.c +1
-1@@ -115,7 +115,7 @@ static inline void 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) -return kasan_mempool_poison_object (element); +return kasan_mempool_poison_object (element, false);else if (pool->alloc == mempool_alloc_pages)return kasan_mempool_poison_pages (element, (unsigned long )pool->pool_data);net/core/skbuff.c +1
-2@@ -1457,7 +1457,7 @@ static void napi_skb_cache_put(struct sk_buff *skb)struct napi_alloc_cache *nc =this_cpu_ptr (&napi_alloc_cache);u32 i; -if (!kasan_mempool_poison_object (skb)) +if (!kasan_mempool_poison_object (skb, false))return ;local_lock_nested_bh (&napi_alloc_cache.bh_lock); --
Quoted 2 lines
2.45.3
Thank you!
Jens Axboe
maintainerRe: [PATCH v2] kasan, mempool: don't store free stacktrace in io_alloc_cache objects.
In reply to Andrey RyabininI don't think we need this with the recent cleanup of the io_uring struct caching. That should go into 6.14-rc1, it's queued up. So I think let's defer on this one for now? It'll conflict with those changes too.
Signature · 1 line
Jens Axboe