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

Commit cccc4153 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Alistair Delva
Browse files

FROMLIST: arm64: disable function graph tracing with SCS 

The graph tracer hooks returns by modifying frame records on the
(regular) stack, but with SCS the return address is taken from the
shadow stack, and the value in the frame record has no effect. As we
don't currently have a mechanism to determine the corresponding slot
on the shadow stack (and to pass this through the ftrace
infrastructure), for now let's disable the graph tracer when SCS is
enabled.

Bug: 145210207
Change-Id: I6fdca3eee60bb8594401920a420cd3c1e23cabce
(am from https://lore.kernel.org/patchwork/patch/1149057/

)
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 32518aee

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ config ARM64 
	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER if !SHADOW_CALL_STACK

	select HAVE_GCC_PLUGINS

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_HW_BREAKPOINT if PERF_EVENTS