From: Dmitry V. Levin <ldv@altlinux.org>
Date: Thu, 26 Nov 2015 20:29:25 +0000 (+0000)
Subject: x86_64: fix x32 personality support in print_llu_from_low_high_val
X-Git-Tag: v4.11~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6e5e2c134b172ef531fd8382196993baf14bbc7;p=strace

x86_64: fix x32 personality support in print_llu_from_low_high_val

x86 is the only personality supported on x86_64
that has 32-bit syscall arguments.

* io.c (print_llu_from_low_high_val) [X86_64]: Fix
current_personality == 2 case.
---

diff --git a/io.c b/io.c
index 0cdc469f..5ee967c1 100644
--- a/io.c
+++ b/io.c
@@ -182,7 +182,11 @@ print_llu_from_low_high_val(struct tcb *tcp, int arg)
 {
 #if SIZEOF_LONG == SIZEOF_LONG_LONG
 # if SUPPORTED_PERSONALITIES > 1
+#  ifdef X86_64
+	if (current_personality != 1)
+#  else
 	if (current_wordsize == sizeof(long))
+#  endif
 # endif
 		tprintf("%lu", (unsigned long) tcp->u_arg[arg]);
 # if SUPPORTED_PERSONALITIES > 1