Skip to content

Commit

Permalink
kasan: update log messages
Browse files Browse the repository at this point in the history
We decided to use KASAN as the short name of the tool and
KernelAddressSanitizer as the full one.  Update log messages according to
that.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Konstantin Serebryany <kcc@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Andrey Konovalov authored and Linus Torvalds committed Nov 6, 2015
1 parent cdf6a27 commit 25add7e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/x86/mm/kasan_init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,5 @@ void __init kasan_init(void)
__flush_tlb_all();
init_task.kasan_depth = 0;

pr_info("Kernel address sanitizer initialized\n");
pr_info("KernelAddressSanitizer initialized\n");
}
2 changes: 1 addition & 1 deletion mm/kasan/kasan.c
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ static int kasan_mem_notifier(struct notifier_block *nb,

static int __init kasan_memhotplug_init(void)
{
pr_err("WARNING: KASan doesn't support memory hot-add\n");
pr_err("WARNING: KASAN doesn't support memory hot-add\n");
pr_err("Memory hot-add will be disabled\n");

hotplug_memory_notifier(kasan_mem_notifier, 0);
Expand Down
4 changes: 2 additions & 2 deletions mm/kasan/report.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static void print_error_description(struct kasan_access_info *info)
break;
}

pr_err("BUG: KASan: %s in %pS at addr %p\n",
pr_err("BUG: KASAN: %s in %pS at addr %p\n",
bug_type, (void *)info->ip,
info->access_addr);
pr_err("%s of size %zu by task %s/%d\n",
Expand Down Expand Up @@ -224,7 +224,7 @@ static void kasan_report_error(struct kasan_access_info *info)
bug_type = "user-memory-access";
else
bug_type = "wild-memory-access";
pr_err("BUG: KASan: %s on address %p\n",
pr_err("BUG: KASAN: %s on address %p\n",
bug_type, info->access_addr);
pr_err("%s of size %zu by task %s/%d\n",
info->is_write ? "Write" : "Read",
Expand Down

0 comments on commit 25add7e

Please sign in to comment.