Commit d7196d87 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Andrew Morton
Browse files

kasan: unify printk prefixes 

Unify prefixes for printk messages in mm/kasan/.

Link: https://lkml.kernel.org/r/35589629806cf0840e5f01ec9d8011a7bad648df.1696605143.git.andreyknvl@google.com


Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Reviewed-by: default avatarMarco Elver <elver@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: kernel test robot <lkp@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 416a616e

mm/kasan/kasan_test.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Author: Andrey Ryabinin <a.ryabinin@samsung.com>

 */



#define pr_fmt(fmt) "kasan_test: " fmt

#define pr_fmt(fmt) "kasan: test: " fmt



#include <kunit/test.h>

#include <linux/bitops.h>

mm/kasan/kasan_test_module.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Author: Andrey Ryabinin <a.ryabinin@samsung.com>

 */



#define pr_fmt(fmt) "kasan test: %s " fmt, __func__

#define pr_fmt(fmt) "kasan: test: " fmt



#include <linux/mman.h>

#include <linux/module.h>

mm/kasan/quarantine.c

+3 −1
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
 * Based on code by Dmitry Chernenkov.

 */



#define pr_fmt(fmt) "kasan: " fmt



#include <linux/gfp.h>

#include <linux/hash.h>

#include <linux/kernel.h>
@@ -414,7 +416,7 @@ static int __init kasan_cpu_quarantine_init(void) 
	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "mm/kasan:online",

				kasan_cpu_online, kasan_cpu_offline);

	if (ret < 0)

		pr_err("kasan cpu quarantine register failed [%d]\n", ret);

		pr_err("cpu quarantine register failed [%d]\n", ret);

	return ret;

}

late_initcall(kasan_cpu_quarantine_init);

mm/kasan/report_generic.c

+3 −3
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static bool __must_check tokenize_frame_descr(const char **frame_descr, 
		const size_t tok_len = sep - *frame_descr;



		if (tok_len + 1 > max_tok_len) {

			pr_err("KASAN internal error: frame description too long: %s\n",

			pr_err("internal error: frame description too long: %s\n",

			       *frame_descr);

			return false;

		}
@@ -233,7 +233,7 @@ static bool __must_check tokenize_frame_descr(const char **frame_descr, 
	*frame_descr = sep + 1;



	if (value != NULL && kstrtoul(token, 10, value)) {

		pr_err("KASAN internal error: not a valid number: %s\n", token);

		pr_err("internal error: not a valid number: %s\n", token);

		return false;

	}
@@ -323,7 +323,7 @@ static bool __must_check get_address_stack_frame_info(const void *addr, 


	frame = (const unsigned long *)(mem_ptr + KASAN_GRANULE_SIZE);

	if (frame[0] != KASAN_CURRENT_STACK_FRAME_MAGIC) {

		pr_err("KASAN internal error: frame info validation failed; invalid marker: %lu\n",

		pr_err("internal error: frame has invalid marker: %lu\n",

		       frame[0]);

		return false;

	}