Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59a631bc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: Disable KASAN in uwwind_frame"

parents 993b116d dde29fdd

arch/arm64/kernel/stacktrace.c

+2 −2
Original line number Original line 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->fp = *(unsigned long *)(fp);

	frame->pc = *(unsigned long *)(fp + 8);

	frame->pc = *(unsigned long *)(fp + 8);





	kasan_enable_current();



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	if (tsk && tsk->ret_stack &&

	if (tsk && tsk->ret_stack &&

			(frame->pc == (unsigned long)return_to_handler)) {

			(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;

	return 0;

}

}