diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2022-01-27 12:04:27 -0600 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2022-03-10 13:37:13 -0600 |
| commit | c145137dc990fd67b52fbc52faae5ba46f168cca (patch) | |
| tree | 86b4317a0e5aeaa6ca3e1dfc1d778ee57bf62acc | |
| parent | ptrace: Remove arch_syscall_{enter,exit}_tracehook (diff) | |
| download | linux-dev-c145137dc990fd67b52fbc52faae5ba46f168cca.tar.xz linux-dev-c145137dc990fd67b52fbc52faae5ba46f168cca.zip | |
ptrace: Remove tracehook_signal_handler
The two line function tracehook_signal_handler is only called from
signal_delivered. Expand it inline in signal_delivered and remove it.
Just to make it easier to understand what is going on.
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/20220309162454.123006-5-ebiederm@xmission.com
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
| -rw-r--r-- | arch/Kconfig | 1 | ||||
| -rw-r--r-- | include/linux/tracehook.h | 17 | ||||
| -rw-r--r-- | kernel/signal.c | 3 |
3 files changed, 2 insertions, 19 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index a517a949eb1d..6382520ef0a5 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -219,7 +219,6 @@ config TRACE_IRQFLAGS_SUPPORT # CORE_DUMP_USE_REGSET #define'd in linux/elf.h # TIF_SYSCALL_TRACE calls ptrace_report_syscall_{entry,exit} # TIF_NOTIFY_RESUME calls tracehook_notify_resume() -# signal delivery calls tracehook_signal_handler() # config HAVE_ARCH_TRACEHOOK bool diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h index 819e82ac09bd..b77bf4917196 100644 --- a/include/linux/tracehook.h +++ b/include/linux/tracehook.h @@ -53,23 +53,6 @@ struct linux_binprm; /** - * tracehook_signal_handler - signal handler setup is complete - * @stepping: nonzero if debugger single-step or block-step in use - * - * Called by the arch code after a signal handler has been set up. - * Register and stack state reflects the user handler about to run. - * Signal mask changes have already been made. - * - * Called without locks, shortly before returning to user mode - * (or handling more signals). - */ -static inline void tracehook_signal_handler(int stepping) -{ - if (stepping) - ptrace_notify(SIGTRAP); -} - -/** * set_notify_resume - cause tracehook_notify_resume() to be called * @task: task that will call tracehook_notify_resume() * diff --git a/kernel/signal.c b/kernel/signal.c index 38602738866e..0e0bd1c1068b 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2898,7 +2898,8 @@ static void signal_delivered(struct ksignal *ksig, int stepping) set_current_blocked(&blocked); if (current->sas_ss_flags & SS_AUTODISARM) sas_ss_reset(current); - tracehook_signal_handler(stepping); + if (stepping) + ptrace_notify(SIGTRAP); } void signal_setup_done(int failed, struct ksignal *ksig, int stepping) |