Fix decoding and dumping of readv syscall in case of short read

[strace] / lseek.c

diff --git a/lseek.c b/lseek.c
index 7a0a501e8a288b8501b2622dd99a7a9c80b2047d..fe4b695c6ddbc2a217b25989a71c8af75105d2a0 100644 (file)
--- a/lseek.c
+++ b/lseek.c
@@ -1,3 +1,38 @@
+/*
+ * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 2002-2005 Roland McGrath <roland@redhat.com>
+ * Copyright (c) 2009 Andreas Schwab <schwab@redhat.com>
+ * Copyright (c) 2012 H.J. Lu <hongjiu.lu@intel.com>
+ * Copyright (c) 2013 Denys Vlasenko <vda.linux@googlemail.com>
+ * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "defs.h"
 
 #include "xlat/whence_codes.h"
@@ -10,42 +45,44 @@
  * Use test/x32_lseek.c to test lseek decoding.
  */
 #if defined(LINUX_MIPSN32) || defined(X32)
-int
-sys_lseek(struct tcb *tcp)
+SYS_FUNC(lseek)
 {
        long long offset;
        int whence;
 
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               offset = tcp->ext_arg[1];
-               whence = tcp->u_arg[2];
-               if (whence == SEEK_SET)
-                       tprintf(", %llu, ", offset);
-               else
-                       tprintf(", %lld, ", offset);
-               printxval(whence_codes, whence, "SEEK_???");
-       }
-       return RVAL_LUDECIMAL;
+       printfd(tcp, tcp->u_arg[0]);
+# ifdef X32
+       /* tcp->ext_arg is not initialized for i386 personality */
+       if (current_personality == 1)
+               offset = tcp->u_arg[1];
+       else
+# endif
+       offset = tcp->ext_arg[1];
+       whence = tcp->u_arg[2];
+       if (whence == SEEK_SET)
+               tprintf(", %llu, ", offset);
+       else
+               tprintf(", %lld, ", offset);
+       printxval(whence_codes, whence, "SEEK_???");
+
+       return RVAL_DECODED | RVAL_LUDECIMAL;
 }
 #else
-int
-sys_lseek(struct tcb *tcp)
+SYS_FUNC(lseek)
 {
        long offset;
        int whence;
 
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               offset = tcp->u_arg[1];
-               whence = tcp->u_arg[2];
-               if (whence == SEEK_SET)
-                       tprintf(", %lu, ", offset);
-               else
-                       tprintf(", %ld, ", offset);
-               printxval(whence_codes, whence, "SEEK_???");
-       }
-       return RVAL_UDECIMAL;
+       printfd(tcp, tcp->u_arg[0]);
+       offset = tcp->u_arg[1];
+       whence = tcp->u_arg[2];
+       if (whence == SEEK_SET)
+               tprintf(", %lu, ", offset);
+       else
+               tprintf(", %ld, ", offset);
+       printxval(whence_codes, whence, "SEEK_???");
+
+       return RVAL_DECODED | RVAL_UDECIMAL;
 }
 #endif
 
@@ -62,8 +99,7 @@ sys_lseek(struct tcb *tcp)
  * for hi and lo. We would need to use tcp->ext_arg[N] on x32...
  * ...however, x32 (and x86_64) does not _have_ llseek syscall as such.
  */
-int
-sys_llseek(struct tcb *tcp)
+SYS_FUNC(llseek)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
@@ -75,13 +111,9 @@ sys_llseek(struct tcb *tcp)
                        tprintf(", %lld, ",
                                ((long long) tcp->u_arg[1]) << 32 |
                                (unsigned long long) (unsigned) tcp->u_arg[2]);
-       }
-       else {
-               long long off;
-               if (syserror(tcp) || umove(tcp, tcp->u_arg[3], &off) < 0)
-                       tprintf("%#lx, ", tcp->u_arg[3]);
-               else
-                       tprintf("[%llu], ", off);
+       } else {
+               printnum_int64(tcp, tcp->u_arg[3], "%" PRIu64);
+               tprints(", ");
                printxval(whence_codes, tcp->u_arg[4], "SEEK_???");
        }
        return 0;