From 774f1bd29cbaa84a9b211216099559c96b2bbab0 Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Wed, 8 Sep 2021 13:25:55 -0700 Subject: [PATCH] ANDROID: Disable CFI on restricted vendor hooks in TRACE_HEADER_MULTI_READ commit 5e767aa07eea ("ANDROID: use static_call() for restricted hooks") introduced an implementation of __iteriter_##_name when TRACE_HEADER_MULTI_READ is defined. __nocfi that function as well in order to keep the performance optimizations from commit 384becf1643b ("ANDROID: Disable CFI on restricted vendor hooks"). Fixes: 384becf1643b ("ANDROID: Disable CFI on restricted vendor hooks") Change-Id: I6ea1cd767bad95c324c06398475174b710ae4dbe Signed-off-by: Elliot Berman --- include/trace/hooks/vendor_hooks.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/trace/hooks/vendor_hooks.h b/include/trace/hooks/vendor_hooks.h index f51a9ac31045..87fe9ccdc331 100644 --- a/include/trace/hooks/vendor_hooks.h +++ b/include/trace/hooks/vendor_hooks.h @@ -33,7 +33,7 @@ int android_rvh_probe_register(struct tracepoint *tp, void *probe, void *data); .unregfunc = _unreg, \ .funcs = NULL }; \ __TRACEPOINT_ENTRY(_name); \ - int __traceiter_##_name(void *__data, proto) \ + int __nocfi __traceiter_##_name(void *__data, proto) \ { \ struct tracepoint_func *it_func_ptr; \ void *it_func; \