Commit e7ce7500 authored by Tiezhu Yang's avatar Tiezhu Yang Committed by Linus Torvalds
Browse files

kasan: no need to unset panic_on_warn in end_report() 

panic_on_warn is unset inside panic(), so no need to unset it before
calling panic() in end_report().

Link: https://lkml.kernel.org/r/1644324666-15947-6-git-send-email-yangtiezhu@loongson.cn


Signed-off-by: default avatarTiezhu Yang <yangtiezhu@loongson.cn>
Reviewed-by: default avatarMarco Elver <elver@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Xuefeng Li <lixuefeng@loongson.cn>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d83ce027

mm/kasan/report.c

+1 −9
Original line number Diff line number Diff line
@@ -117,16 +117,8 @@ static void end_report(unsigned long *flags, unsigned long addr) 
	pr_err("==================================================================\n");

	add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);

	spin_unlock_irqrestore(&report_lock, *flags);

	if (panic_on_warn && !test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags)) {

		/*

		 * This thread may hit another WARN() in the panic path.

		 * Resetting this prevents additional WARN() from panicking the

		 * system on this thread.  Other threads are blocked by the

		 * panic_mutex in panic().

		 */

		panic_on_warn = 0;

	if (panic_on_warn && !test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags))

		panic("panic_on_warn set ...\n");

	}

	if (kasan_arg_fault == KASAN_ARG_FAULT_PANIC)

		panic("kasan.fault=panic set ...\n");

	kasan_enable_current();