kasan-common-provide-can_alloc-in-kasan_save_stack.patch removed from -mm tree
The patch titled
Subject: kasan: common: provide can_alloc in kasan_save_stack()
has been removed from the -mm tree. Its filename was
kasan-common-provide-can_alloc-in-kasan_save_stack.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Marco Elver <[email protected]>
Subject: kasan: common: provide can_alloc in kasan_save_stack()
Add another argument, can_alloc, to kasan_save_stack() which is passed as-is to __stack_depot_save().
No functional change intended.
Signed-off-by Marco Elver <[email protected]>
Tested-by Shuah Khan <[email protected]>
Reviewed-by Andrey Konovalov <[email protected]>
Cc Alexander Potapenko <[email protected]>
Cc Andrey Ryabinin <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc Lai Jiangshan <[email protected]>
Cc Taras Madan <[email protected]>
Cc Tejun Heo <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Vijayanand Jitta <[email protected]>
Cc Vinayak Menon <[email protected]>
Cc Walter Wu <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/kasan/common.c | 6 +++--- mm/kasan/generic.c | 2 +- mm/kasan/kasan.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
mm/kasan/common.c renamed from mm/kasan/common.c~kasan-common-provide-can_alloc-in-kasan_save_stack +3 -3
@@ -30,20 +30,20 @@#include "kasan.h" #include "../slab.h" -depot_stack_handle_t kasan_save_stack (gfp_t flags) +depot_stack_handle_t kasan_save_stack (gfp_t flags,bool can_alloc) {unsigned long entries[KASAN_STACK_DEPTH ];unsigned int nr_entries; nr_entries =stack_trace_save (entries,ARRAY_SIZE (entries),0 ); nr_entries =filter_irq_stacks (entries, nr_entries); -return stack_depot_save (entries, nr_entries, flags); +return __stack_depot_save (entries, nr_entries, flags, can_alloc); }void kasan_set_track (struct kasan_track *track,gfp_t flags) { track->pid = current->pid; - track->stack =kasan_save_stack (flags); + track->stack =kasan_save_stack (flags, true); }#if defined(CONFIG_KASAN_GENERIC ) || defined(CONFIG_KASAN_SW_TAGS )
mm/kasan/generic.c renamed from mm/kasan/generic.c~kasan-common-provide-can_alloc-in-kasan_save_stack +1 -1
@@ -345,7 +345,7 @@ void kasan_record_aux_stack(void *addr)return ; alloc_meta->aux_stack[1 ] = alloc_meta->aux_stack[0 ]; - alloc_meta->aux_stack[0 ] =kasan_save_stack (GFP_NOWAIT ); + alloc_meta->aux_stack[0 ] =kasan_save_stack (GFP_NOWAIT , true); } void kasan_set_free_info(struct kmem_cache *cache,
mm/kasan/kasan.h renamed from mm/kasan/kasan.h~kasan-common-provide-can_alloc-in-kasan_save_stack +1 -1
@@ -251,7 +251,7 @@ void kasan_report_invalid_free(void *objstruct page *kasan_addr_to_page (const void *addr); -depot_stack_handle_t kasan_save_stack (gfp_t flags); +depot_stack_handle_t kasan_save_stack (gfp_t flags,bool can_alloc);void kasan_set_track (struct kasan_track *track,gfp_t flags);void kasan_set_free_info (struct kmem_cache *cache,void *object,u8 tag); struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,
_
Patches currently in -mm which might be from [email protected] are