ppc64: truncate syscall args for 32-bit personality tracees

* linux/powerpc/get_syscall_args.c (get_syscall_args): Clear upper
32 bits of syscall args for 32-bit personality tracees.
* NEWS: Mention this fix.
This commit is contained in:
Дмитрий Левин 2017-09-20 00:15:02 +00:00
parent c8a294a585
commit 55b097b506
2 changed files with 24 additions and 6 deletions

3
NEWS
View File

@ -6,6 +6,9 @@ Noteworthy changes in release ?.?? (????-??-??)
MEMBARRIER_CMD_*, MFD_*, SO_*, SOL_*, TCP_*, and UFFD_FEATURE_* constants.
* Updated lists of ioctl commands from Linux 4.14.
* Bug fixes
* Fixed powerpc personality support on powerpc64.
Noteworthy changes in release 4.19 (2017-09-05)
===============================================

View File

@ -2,11 +2,26 @@
static int
get_syscall_args(struct tcb *tcp)
{
tcp->u_arg[0] = ppc_regs.orig_gpr3;
tcp->u_arg[1] = ppc_regs.gpr[4];
tcp->u_arg[2] = ppc_regs.gpr[5];
tcp->u_arg[3] = ppc_regs.gpr[6];
tcp->u_arg[4] = ppc_regs.gpr[7];
tcp->u_arg[5] = ppc_regs.gpr[8];
if (current_personality != 0) {
/*
* Zero-extend from 32 bits.
* Use truncate_klong_to_current_wordsize(tcp->u_arg[N])
* in syscall handlers
* if you need to use *sign-extended* parameter.
*/
tcp->u_arg[0] = (uint32_t) ppc_regs.orig_gpr3;
tcp->u_arg[1] = (uint32_t) ppc_regs.gpr[4];
tcp->u_arg[2] = (uint32_t) ppc_regs.gpr[5];
tcp->u_arg[3] = (uint32_t) ppc_regs.gpr[6];
tcp->u_arg[4] = (uint32_t) ppc_regs.gpr[7];
tcp->u_arg[5] = (uint32_t) ppc_regs.gpr[8];
} else {
tcp->u_arg[0] = ppc_regs.orig_gpr3;
tcp->u_arg[1] = ppc_regs.gpr[4];
tcp->u_arg[2] = ppc_regs.gpr[5];
tcp->u_arg[3] = ppc_regs.gpr[6];
tcp->u_arg[4] = ppc_regs.gpr[7];
tcp->u_arg[5] = ppc_regs.gpr[8];
}
return 1;
}