tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ptrace/arm: Rename tracehook_report_syscall report_syscall

Make the arm and arm64 code more concise and less confusing by
renaming the architecture specific tracehook_report_syscall to
report_syscall.

Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/20220309162454.123006-2-ebiederm@xmission.com
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

Eric W. Biederman 42da6b7e 19397e8b

+6 -8
+3 -4
arch/arm/kernel/ptrace.c
··· 831 831 PTRACE_SYSCALL_EXIT, 832 832 }; 833 833 834 - static void tracehook_report_syscall(struct pt_regs *regs, 835 - enum ptrace_syscall_dir dir) 834 + static void report_syscall(struct pt_regs *regs, enum ptrace_syscall_dir dir) 836 835 { 837 836 unsigned long ip; 838 837 ··· 855 856 int scno; 856 857 857 858 if (test_thread_flag(TIF_SYSCALL_TRACE)) 858 - tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER); 859 + report_syscall(regs, PTRACE_SYSCALL_ENTER); 859 860 860 861 /* Do seccomp after ptrace; syscall may have changed. */ 861 862 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER ··· 896 897 trace_sys_exit(regs, regs_return_value(regs)); 897 898 898 899 if (test_thread_flag(TIF_SYSCALL_TRACE)) 899 - tracehook_report_syscall(regs, PTRACE_SYSCALL_EXIT); 900 + report_syscall(regs, PTRACE_SYSCALL_EXIT); 900 901 }
+3 -4
arch/arm64/kernel/ptrace.c
··· 1792 1792 PTRACE_SYSCALL_EXIT, 1793 1793 }; 1794 1794 1795 - static void tracehook_report_syscall(struct pt_regs *regs, 1796 - enum ptrace_syscall_dir dir) 1795 + static void report_syscall(struct pt_regs *regs, enum ptrace_syscall_dir dir) 1797 1796 { 1798 1797 int regno; 1799 1798 unsigned long saved_reg; ··· 1841 1842 unsigned long flags = read_thread_flags(); 1842 1843 1843 1844 if (flags & (_TIF_SYSCALL_EMU | _TIF_SYSCALL_TRACE)) { 1844 - tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER); 1845 + report_syscall(regs, PTRACE_SYSCALL_ENTER); 1845 1846 if (flags & _TIF_SYSCALL_EMU) 1846 1847 return NO_SYSCALL; 1847 1848 } ··· 1869 1870 trace_sys_exit(regs, syscall_get_return_value(current, regs)); 1870 1871 1871 1872 if (flags & (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP)) 1872 - tracehook_report_syscall(regs, PTRACE_SYSCALL_EXIT); 1873 + report_syscall(regs, PTRACE_SYSCALL_EXIT); 1873 1874 1874 1875 rseq_syscall(regs); 1875 1876 }