From 8e5a624b36ba162bd39913cee37d7b41f5163e73 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 31 Mar 2023 10:40:02 +0000 Subject: [PATCH] Revert "ANDROID: kernel: Add restricted vendor hook in creds" This reverts commit 1abc68878a6deab49a79d0e13976803fbaeb0fd2. The hooks added in that commit: android_rvh_commit_creds android_rvh_exit_creds android_rvh_override_creds android_rvh_revert_creds are not used by anyone, so remove them. If they are needed in the future, they can be resubmitted for review. Bug: 181639260 Cc: Kuan-Ying Lee Change-Id: I1b371d6b0be827e39c5163e2ed2134307d81730a Signed-off-by: Greg Kroah-Hartman --- drivers/android/vendor_hooks.c | 5 ----- include/trace/hooks/creds.h | 33 --------------------------------- kernel/cred.c | 6 ------ 3 files changed, 44 deletions(-) delete mode 100644 include/trace/hooks/creds.h diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index e545d42c9759..bc286978d5bc 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -82,10 +81,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_selinux_avc_insert); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_selinux_avc_node_delete); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_selinux_avc_node_replace); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_selinux_avc_lookup); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_commit_creds); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_exit_creds); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_override_creds); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_revert_creds); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_module_core_rw_nx); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_module_init_rw_nx); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_module_permit_before_init); diff --git a/include/trace/hooks/creds.h b/include/trace/hooks/creds.h deleted file mode 100644 index 69a68081f2a3..000000000000 --- a/include/trace/hooks/creds.h +++ /dev/null @@ -1,33 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#undef TRACE_SYSTEM -#define TRACE_SYSTEM creds - -#define TRACE_INCLUDE_PATH trace/hooks -#if !defined(_TRACE_HOOK_CREDS_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_HOOK_CREDS_H -#include -/* - * Following tracepoints are not exported in tracefs and provide a - * mechanism for vendor modules to hook and extend functionality - */ -struct cred; -struct task_struct; -DECLARE_RESTRICTED_HOOK(android_rvh_commit_creds, - TP_PROTO(const struct task_struct *task, const struct cred *new), - TP_ARGS(task, new), 1); - -DECLARE_RESTRICTED_HOOK(android_rvh_exit_creds, - TP_PROTO(const struct task_struct *task, const struct cred *cred), - TP_ARGS(task, cred), 1); - -DECLARE_RESTRICTED_HOOK(android_rvh_override_creds, - TP_PROTO(const struct task_struct *task, const struct cred *new), - TP_ARGS(task, new), 1); - -DECLARE_RESTRICTED_HOOK(android_rvh_revert_creds, - TP_PROTO(const struct task_struct *task, const struct cred *old), - TP_ARGS(task, old), 1); - -#endif /* _TRACE_HOOK_CREDS_H */ -/* This part must be outside protection */ -#include diff --git a/kernel/cred.c b/kernel/cred.c index 7e7c4a83e9b8..811ad654abd1 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -17,8 +17,6 @@ #include #include -#include - #if 0 #define kdebug(FMT, ...) \ printk("[%-5.5s%5u] " FMT "\n", \ @@ -183,7 +181,6 @@ void exit_creds(struct task_struct *tsk) key_put(tsk->cached_requested_key); tsk->cached_requested_key = NULL; #endif - trace_android_rvh_exit_creds(tsk, cred); } /** @@ -502,7 +499,6 @@ int commit_creds(struct cred *new) inc_rlimit_ucounts(new->ucounts, UCOUNT_RLIMIT_NPROC, 1); rcu_assign_pointer(task->real_cred, new); rcu_assign_pointer(task->cred, new); - trace_android_rvh_commit_creds(task, new); if (new->user != old->user || new->user_ns != old->user_ns) dec_rlimit_ucounts(old->ucounts, UCOUNT_RLIMIT_NPROC, 1); alter_cred_subscribers(old, -2); @@ -580,7 +576,6 @@ const struct cred *override_creds(const struct cred *new) get_new_cred((struct cred *)new); alter_cred_subscribers(new, 1); rcu_assign_pointer(current->cred, new); - trace_android_rvh_override_creds(current, new); alter_cred_subscribers(old, -1); kdebug("override_creds() = %p{%d,%d}", old, @@ -609,7 +604,6 @@ void revert_creds(const struct cred *old) validate_creds(override); alter_cred_subscribers(old, 1); rcu_assign_pointer(current->cred, old); - trace_android_rvh_revert_creds(current, old); alter_cred_subscribers(override, -1); put_cred(override); }