kasan-reorder-reporting-functions.patch removed from -mm tree
The patch titled
Subject: kasan: reorder reporting functions
has been removed from the -mm tree. Its filename was
kasan-reorder-reporting-functions.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: kasan: reorder reporting functions
Move print_error_description()'s, report_suppressed()'s, and report_enabled()'s definitions to improve the logical order of function definitions in report.c.
No functional changes.
---
mm/kasan/report.c | 82 ++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 41 deletions(-)
mm/kasan/report.c renamed from mm/kasan/report.c~kasan-reorder-reporting-functions +41 -41
@@ -84,24 +84,29 @@ static int __init kasan_set_multi_shot(c }__setup ("kasan_multi_shot" , kasan_set_multi_shot); -static void print_error_description (struct kasan_report_info *info) +/* +* Used to suppress reports within kasan_disable/enable_current() critical +* sections, which are used for marking accesses to slab metadata. +*/ +static bool report_suppressed (void ) { -if (info->type ==KASAN_REPORT_INVALID_FREE ) { -pr_err ("BUG: KASAN: double-free or invalid-free in %pS\n" , - (void *)info->ip); -return ; - } +#if defined(CONFIG_KASAN_GENERIC ) || defined(CONFIG_KASAN_SW_TAGS ) +if (current->kasan_depth) +return true; +#endif +return false; +} -pr_err ("BUG: KASAN: %s in %pS\n" , -kasan_get_bug_type (info), (void *)info->ip); -if (info->access_size) -pr_err ("%s of size %zu at addr %px by task %s/%d\n" , - info->is_write ?"Write" :"Read" , info->access_size, - info->access_addr, current->comm,task_pid_nr (current)); -else -pr_err ("%s at addr %px by task %s/%d\n" , - info->is_write ?"Write" :"Read" , - info->access_addr, current->comm,task_pid_nr (current)); +/* +* Used to avoid reporting more than one KASAN bug unless kasan_multi_shot +* is enabled. Note that KASAN tests effectively enable kasan_multi_shot +* for their duration. +*/ +static bool report_enabled (void ) +{ +if (test_bit (KASAN_BIT_MULTI_SHOT , &kasan_flags)) +return true; +return !test_and_set_bit (KASAN_BIT_REPORTED , &kasan_flags); }#if IS_ENABLED (CONFIG_KASAN_KUNIT_TEST )
@@ -160,6 +165,26 @@ static void end_report(unsigned long *flkasan_enable_current (); } +static void print_error_description (struct kasan_report_info *info) +{ +if (info->type ==KASAN_REPORT_INVALID_FREE ) { +pr_err ("BUG: KASAN: double-free or invalid-free in %pS\n" , + (void *)info->ip); +return ; + } + +pr_err ("BUG: KASAN: %s in %pS\n" , +kasan_get_bug_type (info), (void *)info->ip); +if (info->access_size) +pr_err ("%s of size %zu at addr %px by task %s/%d\n" , + info->is_write ?"Write" :"Read" , info->access_size, + info->access_addr, current->comm,task_pid_nr (current)); +else +pr_err ("%s at addr %px by task %s/%d\n" , + info->is_write ?"Write" :"Read" , + info->access_addr, current->comm,task_pid_nr (current)); +} +static void print_track (struct kasan_track *track,const char *prefix) {pr_err ("%s by task %u:\n" , prefix, track->pid);
@@ -381,31 +406,6 @@ static void print_memory_metadata(const } } -/* -* Used to suppress reports within kasan_disable/enable_current() critical -* sections, which are used for marking accesses to slab metadata. -*/ -static bool report_suppressed (void ) -{ -#if defined(CONFIG_KASAN_GENERIC ) || defined(CONFIG_KASAN_SW_TAGS ) -if (current->kasan_depth) -return true; -#endif -return false; -} - -/* -* Used to avoid reporting more than one KASAN bug unless kasan_multi_shot -* is enabled. Note that KASAN tests effectively enable kasan_multi_shot -* for their duration. -*/ -static bool report_enabled (void ) -{ -if (test_bit (KASAN_BIT_MULTI_SHOT , &kasan_flags)) -return true; -return !test_and_set_bit (KASAN_BIT_REPORTED , &kasan_flags); -} -static void print_report (struct kasan_report_info *info) {void *tagged_addr = info->access_addr;
_
Patches currently in -mm which might be from [email protected] are
stacktrace-add-interface-based-on-shadow-call-stack.patch arm64-scs-save-scs_sp-values-per-cpu-when-switching-stacks.patch arm64-implement-stack_trace_save_shadow.patch kasan-use-stack_trace_save_shadow.patch