nlattr: add UID/GID netlink attribute decoders

[strace] / lseek.c

diff --git a/lseek.c b/lseek.c
index 133ddd853bda373bc38726b607ceb8348f8d36f8..fbc99cc4bb12d9c4358aed8710075f5eb6f3ca6b 100644 (file)
--- a/lseek.c
+++ b/lseek.c
@@ -8,6 +8,7 @@
  * Copyright (c) 2012 H.J. Lu <hongjiu.lu@intel.com>
  * Copyright (c) 2013 Denys Vlasenko <vda.linux@googlemail.com>
  * Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,58 +41,33 @@
 /* Linux kernel has exactly one version of lseek:
  * fs/read_write.c::SYSCALL_DEFINE3(lseek, unsigned, fd, off_t, offset, unsigned, origin)
  * In kernel, off_t is always the same as (kernel's) long
- * (see include/uapi/asm-generic/posix_types.h),
- * which means that on x32 we need to use tcp->ext_arg[N] to get offset argument.
+ * (see include/uapi/asm-generic/posix_types.h).
  * Use test/x32_lseek.c to test lseek decoding.
  */
-#if defined(LINUX_MIPSN32) || defined(X32)
 SYS_FUNC(lseek)
 {
        printfd(tcp, tcp->u_arg[0]);
 
-       long long offset;
-# 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];
-       int whence = tcp->u_arg[2];
-
-       tprintf(", %lld, ", offset);
-       printxval(whence_codes, whence, "SEEK_???");
+       kernel_long_t offset;
 
-       return RVAL_DECODED | RVAL_LUDECIMAL;
-}
-#else
-SYS_FUNC(lseek)
-{
-       printfd(tcp, tcp->u_arg[0]);
+# ifndef current_klongsize
+       if (current_klongsize < sizeof(kernel_long_t)) {
+               offset = (int) tcp->u_arg[1];
+       } else
+# endif /* !current_klongsize */
+       {
+               offset = tcp->u_arg[1];
+       }
 
-       long offset =
-# if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-#  ifdef X86_64
-               current_personality == 1 ?
-                       (long)(int) tcp->u_arg[1] : tcp->u_arg[1];
-#  else
-               current_wordsize == 4 ?
-                       (long)(int) tcp->u_arg[1] : tcp->u_arg[1];
-#  endif
-# else
-               tcp->u_arg[1];
-# endif
-       int whence = tcp->u_arg[2];
+       tprintf(", %" PRI_kld ", ", offset);
 
-       tprintf(", %ld, ", offset);
-       printxval(whence_codes, whence, "SEEK_???");
+       printxval(whence_codes, tcp->u_arg[2], "SEEK_???");
 
-       return RVAL_DECODED | RVAL_UDECIMAL;
+       return RVAL_DECODED;
 }
-#endif
 
 /* llseek syscall takes explicitly two ulong arguments hi, lo,
- * rather than one 64-bit argument for which LONG_LONG works
+ * rather than one 64-bit argument for which ULONG_LONG works
  * appropriate for the native byte order.
  *
  * See kernel's fs/read_write.c::SYSCALL_DEFINE5(llseek, ...)
@@ -100,16 +76,15 @@ SYS_FUNC(lseek)
  * ((loff_t) hi << 32) | lo
  * Note that for architectures with kernel's long wider than userspace long
  * (such as x32), combining code will use *kernel's*, i.e. *wide* longs
- * 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.
+ * for hi and lo.
  */
 SYS_FUNC(llseek)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprintf(", %lld, ",
-                       (widen_to_ull(tcp->u_arg[1]) << 32)
-                       | widen_to_ull(tcp->u_arg[2]));
+                         ((long long) tcp->u_arg[1] << 32)
+                       | ((long long) tcp->u_arg[2]));
        } else {
                printnum_int64(tcp, tcp->u_arg[3], "%" PRIu64);
                tprints(", ");