/* 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 SIZEOF_KERNEL_LONG_T > SIZEOF_LONG
SYS_FUNC(lseek)
{
printfd(tcp, tcp->u_arg[0]);
- long long offset;
+ kernel_long_t offset;
+
# ifndef current_klongsize
- if (current_klongsize < sizeof(*tcp->u_arg)) {
- offset = (long) tcp->u_arg[1];
+ if (current_klongsize < sizeof(kernel_long_t)) {
+ offset = (int) tcp->u_arg[1];
} else
# endif /* !current_klongsize */
{
offset = tcp->u_arg[1];
}
- int whence = tcp->u_arg[2];
-
- tprintf(", %lld, ", offset);
- printxval(whence_codes, whence, "SEEK_???");
- return RVAL_DECODED | RVAL_UDECIMAL;
-}
-#else
-SYS_FUNC(lseek)
-{
- printfd(tcp, tcp->u_arg[0]);
-
- long offset =
-# ifndef current_klongsize
- current_klongsize < sizeof(long) ?
- (long) (int) tcp->u_arg[1] : (long) tcp->u_arg[1];
-# 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;
}
-#endif
/* llseek syscall takes explicitly two ulong arguments hi, lo,
* rather than one 64-bit argument for which ULONG_LONG works
* ((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, ",
- (zero_extend_signed_to_ull(tcp->u_arg[1]) << 32)
- | zero_extend_signed_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(", ");