asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cfi: print target address on failure

Browse source 
Bug: 78862212
Bug: 67506682
Change-Id: Ifaa3e3f8fc5f19649f4857d185d50383b4a89055
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
This commit is contained in:
Sami Tolvanen 2018-04-30 12:23:14 -07:00 committed by Amit Pundir
parent a9f1777ebf
commit aee47441ed
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kernel/cfi.c
View file

@ -24,12 +24,12 @@
#define cfi_slowpath_handler __cfi_slowpath #define cfi_slowpath_handler __cfi_slowpath
#endif /* CONFIG_CFI_PERMISSIVE */ #endif /* CONFIG_CFI_PERMISSIVE */
static inline void handle_cfi_failure() static inline void handle_cfi_failure(void *ptr)
{ {
#ifdef CONFIG_CFI_PERMISSIVE #ifdef CONFIG_CFI_PERMISSIVE
WARN_RATELIMIT(1, "CFI failure:\n"); WARN_RATELIMIT(1, "CFI failure (target: [<%px>] %pF):\n", ptr, ptr);
#else #else
pr_err("CFI failure:\n"); pr_err("CFI failure (target: [<%px>] %pF):\n", ptr, ptr);
BUG(); BUG();
#endif #endif
} }
@ -283,18 +283,18 @@ void cfi_slowpath_handler(uint64_t id, void *ptr, void *diag)
if (likely(check)) if (likely(check))
check(id, ptr, diag); check(id, ptr, diag);
else /* Don't allow unchecked modules */ else /* Don't allow unchecked modules */
handle_cfi_failure(); handle_cfi_failure(ptr);
} }
EXPORT_SYMBOL(cfi_slowpath_handler); EXPORT_SYMBOL(cfi_slowpath_handler);
#endif /* CONFIG_MODULES */ #endif /* CONFIG_MODULES */
void cfi_failure_handler(void *data, void *value, void *vtable) void cfi_failure_handler(void *data, void *ptr, void *vtable)
{ {
handle_cfi_failure(); handle_cfi_failure(ptr);
} }
EXPORT_SYMBOL(cfi_failure_handler); EXPORT_SYMBOL(cfi_failure_handler);
void __cfi_check_fail(void *data, void *value) void __cfi_check_fail(void *data, void *ptr)
{ {
handle_cfi_failure(); handle_cfi_failure(ptr);
} }