Merge "arm64: Disable KASAN in uwwind_frame" (59a631bc) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm64/kernel/stacktrace.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -69,6 +69,8 @@ int notrace unwind_frame(struct task_struct tsk, struct stackframe frame)
		frame->fp = (unsigned long )(fp);
		frame->pc = (unsigned long )(fp + 8);

		kasan_enable_current();

		#ifdef CONFIG_FUNCTION_GRAPH_TRACER
		if (tsk && tsk->ret_stack &&
		(frame->pc == (unsigned long)return_to_handler)) {
		@@ -112,8 +114,6 @@ int notrace unwind_frame(struct task_struct tsk, struct stackframe frame)
		}
		}

		kasan_enable_current();

		return 0;
		}