From daa04830aa4cbde55808294a3349686751f13a44 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 16 Aug 2016 09:15:36 +0000 Subject: [PATCH] sparc64: fix sign extension bug of syscall args for sparc personality * linux/sparc64/get_syscall_args.c (get_syscall_args): Zero-extend syscall args from 32 bit for sparc personality. --- linux/sparc64/get_syscall_args.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/linux/sparc64/get_syscall_args.c b/linux/sparc64/get_syscall_args.c index 821c3313..8d29785f 100644 --- a/linux/sparc64/get_syscall_args.c +++ b/linux/sparc64/get_syscall_args.c @@ -1 +1,27 @@ -#include "sparc/get_syscall_args.c" +/* Return -1 on error or 1 on success (never 0!). */ +static int +get_syscall_args(struct tcb *tcp) +{ + if (tcp->currpers == 1) { + /* + * Zero-extend from 32 bits. + * Use widen_to_long(tcp->u_arg[N]) in syscall handlers + * if you need to use *sign-extended* parameter. + */ + tcp->u_arg[0] = (long) (uint32_t) sparc_regs.u_regs[U_REG_O0 + 0]; + tcp->u_arg[1] = (long) (uint32_t) sparc_regs.u_regs[U_REG_O0 + 1]; + tcp->u_arg[2] = (long) (uint32_t) sparc_regs.u_regs[U_REG_O0 + 2]; + tcp->u_arg[3] = (long) (uint32_t) sparc_regs.u_regs[U_REG_O0 + 3]; + tcp->u_arg[4] = (long) (uint32_t) sparc_regs.u_regs[U_REG_O0 + 4]; + tcp->u_arg[5] = (long) (uint32_t) sparc_regs.u_regs[U_REG_O0 + 5]; + } else { + tcp->u_arg[0] = sparc_regs.u_regs[U_REG_O0 + 0]; + tcp->u_arg[1] = sparc_regs.u_regs[U_REG_O0 + 1]; + tcp->u_arg[2] = sparc_regs.u_regs[U_REG_O0 + 2]; + tcp->u_arg[3] = sparc_regs.u_regs[U_REG_O0 + 3]; + tcp->u_arg[4] = sparc_regs.u_regs[U_REG_O0 + 4]; + tcp->u_arg[5] = sparc_regs.u_regs[U_REG_O0 + 5]; + } + + return 1; +} -- 2.40.0