diff options
| author | Paul Moore <paul@paul-moore.com> | 2016-06-22 16:40:07 -0400 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2016-06-22 16:40:07 -0400 |
| commit | da7f750c1ef570c0a22e5a3fc1fdfd8d308d9a1a (patch) | |
| tree | 9d6e8e9723f26899e533f0f247b126d769f77595 /arch/s390/kernel/ptrace.c | |
| parent | 66b12abc846d31e75fa5f2f31db1396ddfa8ee4a (diff) | |
| download | op-kernel-dev-da7f750c1ef570c0a22e5a3fc1fdfd8d308d9a1a.zip op-kernel-dev-da7f750c1ef570c0a22e5a3fc1fdfd8d308d9a1a.tar.gz | |
s390: ensure that syscall arguments are properly masked on s390
When executing s390 code on s390x the syscall arguments are not
properly masked, leading to some malformed audit records.
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'arch/s390/kernel/ptrace.c')
| -rw-r--r-- | arch/s390/kernel/ptrace.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c index 49b1c13..defc0dc 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c @@ -822,6 +822,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) { long ret = 0; + unsigned long mask = -1UL; /* Do the secure computing check first. */ if (secure_computing()) { @@ -849,9 +850,12 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT))) trace_sys_enter(regs, regs->gprs[2]); - audit_syscall_entry(regs->gprs[2], regs->orig_gpr2, - regs->gprs[3], regs->gprs[4], - regs->gprs[5]); + if (is_compat_task()) + mask = 0xffffffff; + + audit_syscall_entry(regs->gprs[2], regs->orig_gpr2 & mask, + regs->gprs[3] & mask, regs->gprs[4] & mask, + regs->gprs[5] & mask); out: return ret ?: regs->gprs[2]; } |
