tracehook: Remove tracehook.h
Now that all of the definitions have moved out of tracehook.h into ptrace.h, sched/signal.h, resume_user_mode.h there is nothing left in tracehook.h so remove it. Update the few files that were depending upon tracehook.h to bring in definitions to use the headers they need directly. Reviewed-by: Kees Cook <keescook@chromium.org> Link: https://lkml.kernel.org/r/20220309162454.123006-13-ebiederm@xmission.com Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
parent
03248addad
commit
355f841a3f
@ -15623,7 +15623,6 @@ F: arch/*/ptrace*.c
|
||||
F: include/asm-generic/syscall.h
|
||||
F: include/linux/ptrace.h
|
||||
F: include/linux/regset.h
|
||||
F: include/linux/tracehook.h
|
||||
F: include/uapi/linux/ptrace.h
|
||||
F: include/uapi/linux/ptrace.h
|
||||
F: kernel/ptrace.c
|
||||
|
@ -5,7 +5,6 @@
|
||||
#include <linux/sched.h>
|
||||
#include <linux/audit.h>
|
||||
#include <linux/randomize_kstack.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/processor.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <asm/timex.h>
|
||||
|
@ -21,7 +21,6 @@
|
||||
#include <linux/signal.h>
|
||||
#include <linux/elf.h>
|
||||
#include <linux/regset.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/seccomp.h>
|
||||
#include <linux/compat.h>
|
||||
#include <trace/syscall.h>
|
||||
|
@ -25,7 +25,6 @@
|
||||
#include <linux/tty.h>
|
||||
#include <linux/personality.h>
|
||||
#include <linux/binfmts.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/syscalls.h>
|
||||
#include <linux/compat.h>
|
||||
#include <asm/ucontext.h>
|
||||
|
@ -13,7 +13,6 @@
|
||||
#include <linux/errno.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/ptrace.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/user.h>
|
||||
#include <linux/elf.h>
|
||||
#include <linux/security.h>
|
||||
|
@ -18,7 +18,6 @@
|
||||
#include <linux/kstrtox.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/unistd.h>
|
||||
#include <linux/stddef.h>
|
||||
#include <linux/personality.h>
|
||||
|
@ -31,7 +31,6 @@
|
||||
#include <linux/tsacct_kern.h>
|
||||
#include <linux/cn_proc.h>
|
||||
#include <linux/audit.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/kmod.h>
|
||||
#include <linux/fsnotify.h>
|
||||
#include <linux/fs_struct.h>
|
||||
|
@ -56,7 +56,6 @@
|
||||
#include <linux/tsacct_kern.h>
|
||||
#include <linux/cn_proc.h>
|
||||
#include <linux/audit.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/kmod.h>
|
||||
#include <linux/fsnotify.h>
|
||||
#include <linux/fs_struct.h>
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/rculist_nulls.h>
|
||||
#include <linux/cpu.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/task_work.h>
|
||||
#include <linux/audit.h>
|
||||
#include <uapi/linux/io_uring.h>
|
||||
|
||||
|
@ -78,7 +78,6 @@
|
||||
#include <linux/task_work.h>
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/io_uring.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/audit.h>
|
||||
#include <linux/security.h>
|
||||
|
||||
|
@ -88,7 +88,6 @@
|
||||
#include <linux/pid_namespace.h>
|
||||
#include <linux/prctl.h>
|
||||
#include <linux/ptrace.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/string_helpers.h>
|
||||
#include <linux/user_namespace.h>
|
||||
#include <linux/fs_struct.h>
|
||||
|
@ -74,7 +74,6 @@
|
||||
#include <linux/mount.h>
|
||||
#include <linux/security.h>
|
||||
#include <linux/ptrace.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/printk.h>
|
||||
#include <linux/cache.h>
|
||||
#include <linux/cgroup.h>
|
||||
|
@ -1,56 +0,0 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* Tracing hooks
|
||||
*
|
||||
* Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
|
||||
*
|
||||
* This file defines hook entry points called by core code where
|
||||
* user tracing/debugging support might need to do something. These
|
||||
* entry points are called tracehook_*(). Each hook declared below
|
||||
* has a detailed kerneldoc comment giving the context (locking et
|
||||
* al) from which it is called, and the meaning of its return value.
|
||||
*
|
||||
* Each function here typically has only one call site, so it is ok
|
||||
* to have some nontrivial tracehook_*() inlines. In all cases, the
|
||||
* fast path when no tracing is enabled should be very short.
|
||||
*
|
||||
* The purpose of this file and the tracehook_* layer is to consolidate
|
||||
* the interface that the kernel core and arch code uses to enable any
|
||||
* user debugging or tracing facility (such as ptrace). The interfaces
|
||||
* here are carefully documented so that maintainers of core and arch
|
||||
* code do not need to think about the implementation details of the
|
||||
* tracing facilities. Likewise, maintainers of the tracing code do not
|
||||
* need to understand all the calling core or arch code in detail, just
|
||||
* documented circumstances of each call, such as locking conditions.
|
||||
*
|
||||
* If the calling core code changes so that locking is different, then
|
||||
* it is ok to change the interface documented here. The maintainer of
|
||||
* core code changing should notify the maintainers of the tracing code
|
||||
* that they need to work out the change.
|
||||
*
|
||||
* Some tracehook_*() inlines take arguments that the current tracing
|
||||
* implementations might not necessarily use. These function signatures
|
||||
* are chosen to pass in all the information that is on hand in the
|
||||
* caller and might conceivably be relevant to a tracer, so that the
|
||||
* core code won't have to be updated when tracing adds more features.
|
||||
* If a call site changes so that some of those parameters are no longer
|
||||
* already on hand without extra work, then the tracehook_* interface
|
||||
* can change so there is no make-work burden on the core code. The
|
||||
* maintainer of core code changing should notify the maintainers of the
|
||||
* tracing code that they need to work out the change.
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_TRACEHOOK_H
|
||||
#define _LINUX_TRACEHOOK_H 1
|
||||
|
||||
#include <linux/sched.h>
|
||||
#include <linux/ptrace.h>
|
||||
#include <linux/security.h>
|
||||
#include <linux/task_work.h>
|
||||
#include <linux/memcontrol.h>
|
||||
#include <linux/blk-cgroup.h>
|
||||
struct linux_binprm;
|
||||
|
||||
|
||||
|
||||
#endif /* <linux/tracehook.h> */
|
@ -49,7 +49,8 @@
|
||||
#include <linux/audit.h> /* for audit_free() */
|
||||
#include <linux/resource.h>
|
||||
#include <linux/task_io_accounting_ops.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/blkdev.h>
|
||||
#include <linux/task_work.h>
|
||||
#include <linux/fs_struct.h>
|
||||
#include <linux/init_task.h>
|
||||
#include <linux/perf_event.h>
|
||||
|
@ -9,7 +9,6 @@
|
||||
|
||||
#include <linux/cpu.h>
|
||||
#include <linux/stacktrace.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include "core.h"
|
||||
#include "patch.h"
|
||||
#include "transition.h"
|
||||
|
@ -39,7 +39,6 @@
|
||||
#include <linux/pid.h>
|
||||
#include <linux/ptrace.h>
|
||||
#include <linux/capability.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/anon_inodes.h>
|
||||
#include <linux/lockdep.h>
|
||||
|
@ -32,7 +32,7 @@
|
||||
#include <linux/signal.h>
|
||||
#include <linux/signalfd.h>
|
||||
#include <linux/ratelimit.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/task_work.h>
|
||||
#include <linux/capability.h>
|
||||
#include <linux/freezer.h>
|
||||
#include <linux/pid_namespace.h>
|
||||
|
@ -14,7 +14,6 @@
|
||||
#include <linux/file.h>
|
||||
#include <linux/mount.h>
|
||||
#include <linux/syscalls.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/personality.h>
|
||||
#include <linux/xattr.h>
|
||||
#include <linux/user_namespace.h>
|
||||
|
@ -25,7 +25,6 @@
|
||||
#include <linux/kd.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/kernel_read_file.h>
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/sched/signal.h>
|
||||
#include <linux/sched/task.h>
|
||||
|
Loading…
Reference in New Issue
Block a user