From d4f39ef53d05f34aa33c660a6cbb6882dca1b33f Mon Sep 17 00:00:00 2001 From: Kuan-Ying Lee Date: Fri, 18 Jun 2021 13:18:59 +0800 Subject: [PATCH] ANDROID: syscall_check: add vendor hook for mmap syscall Through this vendor hook, we can get the timing to check current running task for the validation of its credential and related operations. Bug: 191291287 Signed-off-by: Kuan-Ying Lee Change-Id: If20bd8bb8311ad10a374033734fbdc7ef61a7704 --- drivers/android/vendor_hooks.c | 2 ++ include/trace/hooks/syscall_check.h | 22 ++++++++++++++++++++++ mm/util.c | 4 ++++ 3 files changed, 28 insertions(+) create mode 100644 include/trace/hooks/syscall_check.h diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 8180105b65f7..3fef7d00852d 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -9,6 +9,7 @@ #define CREATE_TRACE_POINTS #include #include +#include /* * Export tracepoints that act as a bare tracehook (ie: have no trace event @@ -18,3 +19,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_memory_x); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_memory_nx); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_memory_ro); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_memory_rw); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_check_mmap_file); diff --git a/include/trace/hooks/syscall_check.h b/include/trace/hooks/syscall_check.h new file mode 100644 index 000000000000..edb80386511b --- /dev/null +++ b/include/trace/hooks/syscall_check.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM syscall_check + +#define TRACE_INCLUDE_PATH trace/hooks +#if !defined(_TRACE_HOOK_SYSCALL_CHECK_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HOOK_SYSCALL_CHECK_H +#include +#include +/* + * Following tracepoints are not exported in tracefs and provide a + * mechanism for vendor modules to hook and extend functionality + */ +struct file; +DECLARE_HOOK(android_vh_check_mmap_file, + TP_PROTO(const struct file *file, unsigned long prot, + unsigned long flag, unsigned long ret), + TP_ARGS(file, prot, flag, ret)); + +#endif /* _TRACE_HOOK_SYSCALL_CHECK_H */ +/* This part must be outside protection */ +#include diff --git a/mm/util.c b/mm/util.c index 457892211157..f99bdb8fd5f8 100644 --- a/mm/util.c +++ b/mm/util.c @@ -20,6 +20,9 @@ #include #include "internal.h" +#ifndef __GENKSYMS__ +#include +#endif static inline int is_kernel_rodata(unsigned long addr) { @@ -394,6 +397,7 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr, if (populate) mm_populate(ret, populate); } + trace_android_vh_check_mmap_file(file, prot, flag, ret); return ret; }