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

powerpc: Use orig_gpr3 in syscall_get_arguments()

Currently syscall_get_arguments() is used by syscall tracepoints, and
collect_syscall() which is used in some debugging as well as
/proc/pid/syscall.

The current implementation just copies regs->gpr[3 .. 5] out, which is
fine for all the current use cases.

When we enable seccomp filter, that will also start using
syscall_get_arguments(). However for seccomp filter we want to use r3
as the return value of the syscall, and orig_gpr3 as the first
parameter. This will allow seccomp to modify the return value in r3.

To support this we need to modify syscall_get_arguments() to return
orig_gpr3 instead of r3. This is safe for all uses because orig_gpr3
always contains the r3 value that was passed to the syscall. We store it
in the syscall entry path and never modify it.

Update syscall_set_arguments() while we're here, even though it's never
used.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Kees Cook <keescook@chromium.org>

+13 -3
+13 -3
arch/powerpc/include/asm/syscall.h
··· 64 64 unsigned int i, unsigned int n, 65 65 unsigned long *args) 66 66 { 67 - unsigned long mask = -1UL; 67 + unsigned long val, mask = -1UL; 68 68 69 69 BUG_ON(i + n > 6); 70 70 ··· 72 72 if (test_tsk_thread_flag(task, TIF_32BIT)) 73 73 mask = 0xffffffff; 74 74 #endif 75 - while (n--) 76 - args[n] = regs->gpr[3 + i + n] & mask; 75 + while (n--) { 76 + if (n == 0 && i == 0) 77 + val = regs->orig_gpr3; 78 + else 79 + val = regs->gpr[3 + i + n]; 80 + 81 + args[n] = val & mask; 82 + } 77 83 } 78 84 79 85 static inline void syscall_set_arguments(struct task_struct *task, ··· 89 83 { 90 84 BUG_ON(i + n > 6); 91 85 memcpy(&regs->gpr[3 + i], args, n * sizeof(args[0])); 86 + 87 + /* Also copy the first argument into orig_gpr3 */ 88 + if (i == 0 && n > 0) 89 + regs->orig_gpr3 = args[0]; 92 90 } 93 91 94 92 static inline int syscall_get_arch(void)