Message ID | 1466207668-10549-13-git-send-email-ynorov@caviumnetworks.com |
---|---|
State | New |
Headers | show |
Hi Zhou, Thank you for the patch. The idea is ok, but patch format got broken for some reason. Could you re-send it? Yury. On Mon, Jun 27, 2016 at 12:49:05PM +0800, zhouchengming wrote: > atus: RO > Content-Length: 4732 > Lines: 181 > > The function compat_ptrace_request(used by ilp32) don't handle > {GET,SET}SIGMASK request, so it will be handled by ptrace_request. > But it's wrong because the compat_sigset_t of ilp32 differs from > the sigset_t of aarch64. The patch fixes it. > > Signed-off-by: Zhou Chengming <zhouchengming1@huawei.com> > --- > arch/arm64/include/asm/signal_ilp32.h | 22 ++++++++++++ > arch/arm64/kernel/ptrace.c | 62 > +++++++++++++++++++++++++++++++++ Here - unneeded line break > arch/arm64/kernel/signal_ilp32.c | 23 +------------ > 3 files changed, 85 insertions(+), 22 deletions(-) > > diff --git a/arch/arm64/include/asm/signal_ilp32.h > b/arch/arm64/include/asm/signal_ilp32.h and here > index 30eff23..ed52607 100644 > --- a/arch/arm64/include/asm/signal_ilp32.h > +++ b/arch/arm64/include/asm/signal_ilp32.h > @@ -21,6 +21,28 @@ > int ilp32_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set, > struct pt_regs *regs); > > +static inline int put_sigset_t(compat_sigset_t __user *uset, sigset_t *set) > +{ > + compat_sigset_t cset; > + > + cset.sig[0] = set->sig[0] & 0xffffffffull; > + cset.sig[1] = set->sig[0] >> 32; > + > + return copy_to_user(uset, &cset, sizeof(*uset)); > +} > + > +static inline int get_sigset_t(sigset_t *set, > + const compat_sigset_t __user *uset) > +{ > + compat_sigset_t s32; > + > + if (copy_from_user(&s32, uset, sizeof(*uset))) > + return -EFAULT; > + > + set->sig[0] = s32.sig[0] | (((long)s32.sig[1]) << 32); > + return 0; > +} > + > #else > > static inline int ilp32_setup_rt_frame(int usig, struct ksignal *ksig, > sigset_t *set, and here > diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c > index a861105..8d4cad1 100644 > --- a/arch/arm64/kernel/ptrace.c > +++ b/arch/arm64/kernel/ptrace.c > @@ -44,6 +44,7 @@ > #include <asm/syscall.h> > #include <asm/traps.h> > #include <asm/system_misc.h> > +#include <asm/signal_ilp32.h> > > #define CREATE_TRACE_POINTS > #include <trace/events/syscalls.h> > @@ -1231,12 +1232,73 @@ COMPAT_SYSCALL_DEFINE4(aarch32_ptrace, > compat_long_t, request, compat_long_t, pi and later on the patch > > #endif /* CONFIG_AARCH32_EL0 */ > > +#ifdef CONFIG_ARM64_ILP32 > + > +static int compat_ilp32_ptrace(struct task_struct *child, compat_long_t > request, > + compat_ulong_t addr, compat_ulong_t data) > +{ > + compat_ulong_t __user *datap = compat_ptr(data); > + int ret; > + > + switch (request) { > + case PTRACE_GETSIGMASK: > + if (addr != sizeof(compat_sigset_t)) { > + ret = -EINVAL; > + break; > + } > + > + if (put_sigset_t((compat_sigset_t __user *)datap, &child->blocked)) > + ret = -EFAULT; > + else > + ret = 0; > + break; > + > + case PTRACE_SETSIGMASK: { > + sigset_t new_set; > + if (addr != sizeof(compat_sigset_t)) { > + ret = -EINVAL; > + break; > + } > + > + if (get_sigset_t(&new_set, (compat_sigset_t __user *)datap)) { > + ret = -EFAULT; > + break; > + } > + > + sigdelsetmask(&new_set, sigmask(SIGKILL)|sigmask(SIGSTOP)); > + > + /* > + * Every thread does recalc_sigpending() after resume, so > + * retarget_shared_pending() and recalc_sigpending() are not > + * called here. > + */ > + spin_lock_irq(&child->sighand->siglock); > + child->blocked = new_set; > + spin_unlock_irq(&child->sighand->siglock); > + > + ret = 0; > + break; > + } > + > + default: > + ret = compat_ptrace_request(child, request, addr, data); > + } > + > + return ret; > +} > + > +#endif /* CONFIG_ARM64_ILP32 */ > + > #ifdef CONFIG_COMPAT > > long compat_arch_ptrace(struct task_struct *child, compat_long_t request, > compat_ulong_t caddr, compat_ulong_t cdata) > { > +#ifdef CONFIG_ARM64_ILP32 > + return compat_ilp32_ptrace(child, request, caddr, cdata); > +#else > return compat_ptrace_request(child, request, caddr, cdata); > +#endif > } > > #endif /* CONFIG_COMPAT */ > diff --git a/arch/arm64/kernel/signal_ilp32.c > b/arch/arm64/kernel/signal_ilp32.c > index 8ca64b9..3ef2749 100644 > --- a/arch/arm64/kernel/signal_ilp32.c > +++ b/arch/arm64/kernel/signal_ilp32.c > @@ -28,6 +28,7 @@ > #include <asm/fpsimd.h> > #include <asm/signal32_common.h> > #include <asm/signal_common.h> > +#include <asm/signal_ilp32.h> > #include <asm/uaccess.h> > #include <asm/unistd.h> > #include <asm/ucontext.h> > @@ -58,28 +59,6 @@ struct ilp32_rt_sigframe { > struct ilp32_sigframe sig; > }; > > -static inline int put_sigset_t(compat_sigset_t __user *uset, sigset_t *set) > -{ > - compat_sigset_t cset; > - > - cset.sig[0] = set->sig[0] & 0xffffffffull; > - cset.sig[1] = set->sig[0] >> 32; > - > - return copy_to_user(uset, &cset, sizeof(*uset)); > -} > - > -static inline int get_sigset_t(sigset_t *set, > - const compat_sigset_t __user *uset) > -{ > - compat_sigset_t s32; > - > - if (copy_from_user(&s32, uset, sizeof(*uset))) > - return -EFAULT; > - > - set->sig[0] = s32.sig[0] | (((long)s32.sig[1]) << 32); > - return 0; > -} > - > static int restore_ilp32_sigframe(struct pt_regs *regs, > struct
diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index b7e8ef1..6da7cbd 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@ -74,7 +74,7 @@ __SYSCALL(__NR_getuid, sys_getuid16) /* 25 was sys_stime */ __SYSCALL(25, sys_ni_syscall) #define __NR_ptrace 26 -__SYSCALL(__NR_ptrace, compat_sys_ptrace) +__SYSCALL(__NR_ptrace, compat_sys_aarch32_ptrace) /* 27 was sys_alarm */ __SYSCALL(27, sys_ni_syscall) /* 28 was sys_fstat */ diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 38a09338..a861105 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -29,6 +29,7 @@ #include <linux/user.h> #include <linux/seccomp.h> #include <linux/security.h> +#include <linux/syscalls.h> #include <linux/init.h> #include <linux/signal.h> #include <linux/uaccess.h> @@ -1114,7 +1115,7 @@ static int compat_ptrace_sethbpregs(struct task_struct *tsk, compat_long_t num, } #endif /* CONFIG_HAVE_HW_BREAKPOINT */ -long compat_arch_ptrace(struct task_struct *child, compat_long_t request, +static long compat_a32_ptrace(struct task_struct *child, compat_long_t request, compat_ulong_t caddr, compat_ulong_t cdata) { unsigned long addr = caddr; @@ -1191,8 +1192,55 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, return ret; } + +COMPAT_SYSCALL_DEFINE4(aarch32_ptrace, compat_long_t, request, compat_long_t, pid, + compat_long_t, addr, compat_long_t, data) +{ + struct task_struct *child; + long ret; + + if (request == PTRACE_TRACEME) { + ret = ptrace_traceme(); + goto out; + } + + child = ptrace_get_task_struct(pid); + if (IS_ERR(child)) { + ret = PTR_ERR(child); + goto out; + } + + if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) { + ret = ptrace_attach(child, request, addr, data); + goto out_put_task_struct; + } + + ret = ptrace_check_attach(child, request == PTRACE_KILL || + request == PTRACE_INTERRUPT); + if (!ret) { + ret = compat_a32_ptrace(child, request, addr, data); + if (ret || request != PTRACE_DETACH) + ptrace_unfreeze_traced(child); + } + + out_put_task_struct: + put_task_struct(child); + out: + return ret; +} + #endif /* CONFIG_AARCH32_EL0 */ +#ifdef CONFIG_COMPAT + +long compat_arch_ptrace(struct task_struct *child, compat_long_t request, + compat_ulong_t caddr, compat_ulong_t cdata) +{ + return compat_ptrace_request(child, request, caddr, cdata); +} + +#endif /* CONFIG_COMPAT */ + const struct user_regset_view *task_user_regset_view(struct task_struct *task) { #ifdef CONFIG_AARCH32_EL0 diff --git a/arch/arm64/kernel/sys32.c b/arch/arm64/kernel/sys32.c index a40b134..3752443 100644 --- a/arch/arm64/kernel/sys32.c +++ b/arch/arm64/kernel/sys32.c @@ -38,6 +38,7 @@ asmlinkage long compat_sys_fadvise64_64_wrapper(void); asmlinkage long compat_sys_sync_file_range2_wrapper(void); asmlinkage long compat_sys_fallocate_wrapper(void); asmlinkage long compat_sys_mmap2_wrapper(void); +asmlinkage long compat_sys_aarch32_ptrace(void); #undef __SYSCALL #define __SYSCALL(nr, sym) [nr] = sym, diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index 504c98a..75887a0 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h @@ -97,6 +97,12 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr, unsigned long data); int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr, unsigned long data); +int ptrace_traceme(void); +struct task_struct *ptrace_get_task_struct(pid_t pid); +int ptrace_attach(struct task_struct *task, long request, + unsigned long addr, unsigned long flags); +int ptrace_check_attach(struct task_struct *child, bool ignore_state); +void ptrace_unfreeze_traced(struct task_struct *task); /** * ptrace_parent - return the task that is tracing the given task diff --git a/kernel/ptrace.c b/kernel/ptrace.c index d49bfa1..cadf24c 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -136,7 +136,7 @@ static bool ptrace_freeze_traced(struct task_struct *task) return ret; } -static void ptrace_unfreeze_traced(struct task_struct *task) +void ptrace_unfreeze_traced(struct task_struct *task) { if (task->state != __TASK_TRACED) return; @@ -168,7 +168,7 @@ static void ptrace_unfreeze_traced(struct task_struct *task) * RETURNS: * 0 on success, -ESRCH if %child is not ready. */ -static int ptrace_check_attach(struct task_struct *child, bool ignore_state) +int ptrace_check_attach(struct task_struct *child, bool ignore_state) { int ret = -ESRCH; @@ -292,7 +292,7 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode) return !err; } -static int ptrace_attach(struct task_struct *task, long request, +int ptrace_attach(struct task_struct *task, long request, unsigned long addr, unsigned long flags) { @@ -406,7 +406,7 @@ out: * Performs checks and sets PT_PTRACED. * Should be used by all ptrace implementations for PTRACE_TRACEME. */ -static int ptrace_traceme(void) + int ptrace_traceme(void) { int ret = -EPERM; @@ -1056,7 +1056,7 @@ int ptrace_request(struct task_struct *child, long request, return ret; } -static struct task_struct *ptrace_get_task_struct(pid_t pid) +struct task_struct *ptrace_get_task_struct(pid_t pid) { struct task_struct *child;
Here new aarch32 ptrace syscall handler is introsuced to avoid run-time detection of the task type. Signed-off-by: Yury Norov <ynorov@caviumnetworks.com> --- arch/arm64/include/asm/unistd32.h | 2 +- arch/arm64/kernel/ptrace.c | 50 ++++++++++++++++++++++++++++++++++++++- arch/arm64/kernel/sys32.c | 1 + include/linux/ptrace.h | 6 +++++ kernel/ptrace.c | 10 ++++---- 5 files changed, 62 insertions(+), 7 deletions(-)