* Copyright (c) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Linux for s390 port by D.J. Barrow
* <barrow_dj@mail.yahoo.com,djbarrow@de.ibm.com>
+ * Copyright (c) 1999-2017 The strace developers.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
# include <sys/xattr.h>
#endif
#include <sys/uio.h>
+#include <asm/unistd.h>
+#include "scno.h"
#include "regs.h"
#include "ptrace.h"
tv->tv_usec %= 1000000;
}
-const char *
-xlookup(const struct xlat *xlat, const uint64_t val)
-{
- for (; xlat->str != NULL; xlat++)
- if (xlat->val == val)
- return xlat->str;
- return NULL;
-}
-
-static int
-xlat_bsearch_compare(const void *a, const void *b)
-{
- const uint64_t val1 = *(const uint64_t *) a;
- const uint64_t val2 = ((const struct xlat *) b)->val;
- return (val1 > val2) ? 1 : (val1 < val2) ? -1 : 0;
-}
-
-const char *
-xlat_search(const struct xlat *xlat, const size_t nmemb, const uint64_t val)
-{
- const struct xlat *e =
- bsearch((const void*) &val,
- xlat, nmemb, sizeof(*xlat), xlat_bsearch_compare);
-
- return e ? e->str : NULL;
-}
-
#if !defined HAVE_STPCPY
char *
stpcpy(char *dst, const char *src)
next_set_bit(const void *bit_array, unsigned cur_bit, unsigned size_bits)
{
const unsigned endian = 1;
- int little_endian = * (char *) (void *) &endian;
+ int little_endian = *(char *) (void *) &endian;
const uint8_t *array = bit_array;
unsigned pos = cur_bit / 8;
}
}
-/**
- * Print entry in struct xlat table, if there.
- *
- * @param val Value to search a literal representation for.
- * @param dflt String (abbreviated in comment syntax) which should be emitted
- * if no appropriate xlat value has been found.
- * @param xlat (And the following arguments) Pointers to arrays of xlat values.
- * The last argument should be NULL.
- * @return 1 if appropriate xlat value has been found, 0 otherwise.
- */
-int
-printxvals(const uint64_t val, const char *dflt, const struct xlat *xlat, ...)
-{
- va_list args;
-
- va_start(args, xlat);
- for (; xlat; xlat = va_arg(args, const struct xlat *)) {
- const char *str = xlookup(xlat, val);
-
- if (str) {
- tprints(str);
- va_end(args);
- return 1;
- }
- }
- /* No hits -- print raw # instead. */
- tprintf("%#" PRIx64, val);
- if (dflt)
- tprintf(" /* %s */", dflt);
-
- va_end(args);
-
- return 0;
-}
-
-/**
- * Print entry in sorted struct xlat table, if it is there.
- *
- * @param xlat Pointer to an array of xlat values (not terminated with
- * XLAT_END).
- * @param xlat_size Number of xlat elements present in array (usually ARRAY_SIZE
- * if array is declared in the unit's scope and not
- * terminated with XLAT_END).
- * @param val Value to search literal representation for.
- * @param dflt String (abbreviated in comment syntax) which should be
- * emitted if no appropriate xlat value has been found.
- * @return 1 if appropriate xlat value has been found, 0
- * otherwise.
- */
-int
-printxval_searchn(const struct xlat *xlat, size_t xlat_size, uint64_t val,
- const char *dflt)
-{
- const char *s = xlat_search(xlat, xlat_size, val);
-
- if (s) {
- tprints(s);
- return 1;
- }
-
- tprintf("%#" PRIx64, val);
- if (dflt)
- tprintf(" /* %s */", dflt);
-
- return 0;
-}
-
/*
* Fetch 64bit argument at position arg_no and
* return the index of the next argument.
int
getllval(struct tcb *tcp, unsigned long long *val, int arg_no)
{
-#if SIZEOF_LONG > 4 && SIZEOF_LONG == SIZEOF_LONG_LONG
+#if SIZEOF_KERNEL_LONG_T > 4
# ifndef current_klongsize
- if (current_klongsize < SIZEOF_LONG) {
+ if (current_klongsize < SIZEOF_KERNEL_LONG_T) {
# if defined(AARCH64) || defined(POWERPC64)
/* Align arg_no to the next even number. */
arg_no = (arg_no + 1) & 0xe;
*val = tcp->u_arg[arg_no];
arg_no++;
}
-#elif SIZEOF_LONG > 4
-# error Unsupported configuration: SIZEOF_LONG > 4 && SIZEOF_LONG_LONG > SIZEOF_LONG
-#elif HAVE_STRUCT_TCB_EXT_ARG
-# ifndef current_klongsize
- if (current_klongsize < SIZEOF_LONG_LONG) {
- *val = ULONG_LONG(tcp->u_arg[arg_no], tcp->u_arg[arg_no + 1]);
- arg_no += 2;
- } else
-# endif /* !current_klongsize */
- {
- *val = tcp->ext_arg[arg_no];
- arg_no++;
- }
-#else
-# if defined __ARM_EABI__ || \
- defined LINUX_MIPSO32 || \
- defined POWERPC || \
- defined XTENSA
+#else /* SIZEOF_KERNEL_LONG_T == 4 */
+# if defined __ARM_EABI__ \
+ || defined LINUX_MIPSO32 \
+ || defined POWERPC \
+ || defined XTENSA
/* Align arg_no to the next even number. */
arg_no = (arg_no + 1) & 0xe;
# elif defined SH
return arg_no;
}
-/*
- * Interpret `xlat' as an array of flags
- * print the entries whose bits are on in `flags'
- * return # of flags printed.
- */
void
-addflags(const struct xlat *xlat, uint64_t flags)
-{
- for (; xlat->str; xlat++) {
- if (xlat->val && (flags & xlat->val) == xlat->val) {
- tprintf("|%s", xlat->str);
- flags &= ~xlat->val;
- }
- }
- if (flags) {
- tprintf("|%#" PRIx64, flags);
- }
-}
-
-/*
- * Interpret `xlat' as an array of flags.
- * Print to static string the entries whose bits are on in `flags'
- * Return static string.
- */
-const char *
-sprintflags(const char *prefix, const struct xlat *xlat, uint64_t flags)
-{
- static char outstr[1024];
- char *outptr;
- int found = 0;
-
- outptr = stpcpy(outstr, prefix);
-
- if (flags == 0 && xlat->val == 0 && xlat->str) {
- strcpy(outptr, xlat->str);
- return outstr;
- }
-
- for (; xlat->str; xlat++) {
- if (xlat->val && (flags & xlat->val) == xlat->val) {
- if (found)
- *outptr++ = '|';
- outptr = stpcpy(outptr, xlat->str);
- found = 1;
- flags &= ~xlat->val;
- if (!flags)
- break;
- }
- }
- if (flags) {
- if (found)
- *outptr++ = '|';
- outptr += sprintf(outptr, "%#" PRIx64, flags);
- }
-
- return outstr;
-}
-
-int
-printflags64(const struct xlat *xlat, uint64_t flags, const char *dflt)
-{
- int n;
- const char *sep;
-
- if (flags == 0 && xlat->val == 0 && xlat->str) {
- tprints(xlat->str);
- return 1;
- }
-
- sep = "";
- for (n = 0; xlat->str; xlat++) {
- if (xlat->val && (flags & xlat->val) == xlat->val) {
- tprintf("%s%s", sep, xlat->str);
- flags &= ~xlat->val;
- sep = "|";
- n++;
- }
- }
-
- if (n) {
- if (flags) {
- tprintf("%s%#" PRIx64, sep, flags);
- n++;
- }
- } else {
- if (flags) {
- tprintf("%#" PRIx64, flags);
- if (dflt)
- tprintf(" /* %s */", dflt);
- } else {
- if (dflt)
- tprints("0");
- }
- }
-
- return n;
-}
-
-void
-printaddr_klu(const kernel_ulong_t addr)
+printaddr(const kernel_ulong_t addr)
{
if (!addr)
tprints("NULL");
#define DEF_PRINTNUM(name, type) \
bool \
-printnum_ ## name(struct tcb *const tcp, const kernel_ureg_t addr, \
+printnum_ ## name(struct tcb *const tcp, const kernel_ulong_t addr, \
const char *const fmt) \
{ \
type num; \
return true; \
}
+#define DEF_PRINTNUM_ADDR(name, type) \
+bool \
+printnum_addr_ ## name(struct tcb *tcp, const kernel_ulong_t addr) \
+{ \
+ type num; \
+ if (umove_or_printaddr(tcp, addr, &num)) \
+ return false; \
+ tprints("["); \
+ printaddr(num); \
+ tprints("]"); \
+ return true; \
+}
+
#define DEF_PRINTPAIR(name, type) \
bool \
-printpair_ ## name(struct tcb *const tcp, const kernel_ureg_t addr, \
+printpair_ ## name(struct tcb *const tcp, const kernel_ulong_t addr, \
const char *const fmt) \
{ \
type pair[2]; \
}
DEF_PRINTNUM(int, int)
+DEF_PRINTNUM_ADDR(int, unsigned int)
DEF_PRINTPAIR(int, int)
DEF_PRINTNUM(short, short)
DEF_PRINTNUM(int64, uint64_t)
+DEF_PRINTNUM_ADDR(int64, uint64_t)
DEF_PRINTPAIR(int64, uint64_t)
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
+#ifndef current_wordsize
bool
-printnum_long_int(struct tcb *const tcp, const kernel_ureg_t addr,
+printnum_long_int(struct tcb *const tcp, const kernel_ulong_t addr,
const char *const fmt_long, const char *const fmt_int)
{
if (current_wordsize > sizeof(int)) {
return printnum_int(tcp, addr, fmt_int);
}
}
-#endif
-const char *
-sprinttime(time_t t)
+bool
+printnum_addr_long_int(struct tcb *tcp, const kernel_ulong_t addr)
{
- struct tm *tmp;
- static char buf[sizeof(int) * 3 * 6 + sizeof("+0000")];
+ if (current_wordsize > sizeof(int)) {
+ return printnum_addr_int64(tcp, addr);
+ } else {
+ return printnum_addr_int(tcp, addr);
+ }
+}
+#endif /* !current_wordsize */
- if (t == 0) {
- strcpy(buf, "0");
- return buf;
+#ifndef current_klongsize
+bool
+printnum_addr_klong_int(struct tcb *tcp, const kernel_ulong_t addr)
+{
+ if (current_klongsize > sizeof(int)) {
+ return printnum_addr_int64(tcp, addr);
+ } else {
+ return printnum_addr_int(tcp, addr);
}
- tmp = localtime(&t);
- if (tmp)
- strftime(buf, sizeof(buf), "%FT%T%z", tmp);
- else
- snprintf(buf, sizeof(buf), "%lu", (unsigned long) t);
+}
+#endif /* !current_klongsize */
- return buf;
+/**
+ * Prints time to a (static internal) buffer and returns pointer to it.
+ *
+ * @param sec Seconds since epoch.
+ * @param part_sec Amount of second parts since the start of a second.
+ * @param max_part_sec Maximum value of a valid part_sec.
+ * @param width 1 + floor(log10(max_part_sec)).
+ */
+static const char *
+sprinttime_ex(const long long sec, const unsigned long long part_sec,
+ const unsigned int max_part_sec, const int width)
+{
+ static char buf[sizeof(int) * 3 * 6 + sizeof(part_sec) * 3
+ + sizeof("+0000")];
+
+ if ((sec == 0 && part_sec == 0) || part_sec > max_part_sec)
+ return NULL;
+
+ time_t t = (time_t) sec;
+ struct tm *tmp = (sec == t) ? localtime(&t) : NULL;
+ if (!tmp)
+ return NULL;
+
+ size_t pos = strftime(buf, sizeof(buf), "%FT%T", tmp);
+ if (!pos)
+ return NULL;
+
+ if (part_sec > 0) {
+ int ret = snprintf(buf + pos, sizeof(buf) - pos, ".%0*llu",
+ width, part_sec);
+
+ if (ret < 0 || (size_t) ret >= sizeof(buf) - pos)
+ return NULL;
+
+ pos += ret;
+ }
+
+ return strftime(buf + pos, sizeof(buf) - pos, "%z", tmp) ? buf : NULL;
+}
+
+const char *
+sprinttime(long long sec)
+{
+ return sprinttime_ex(sec, 0, 0, 0);
+}
+
+const char *
+sprinttime_usec(long long sec, unsigned long long usec)
+{
+ return sprinttime_ex(sec, usec, 999999, 6);
+}
+
+const char *
+sprinttime_nsec(long long sec, unsigned long long nsec)
+{
+ return sprinttime_ex(sec, nsec, 999999999, 9);
}
enum sock_proto
#endif
}
+unsigned long
+getfdinode(struct tcb *tcp, int fd)
+{
+ char path[PATH_MAX + 1];
+
+ if (getfdpath(tcp, fd, path, sizeof(path)) >= 0) {
+ const char *str = STR_STRIP_PREFIX(path, "socket:[");
+
+ if (str != path) {
+ const size_t str_len = strlen(str);
+ if (str_len && str[str_len - 1] == ']')
+ return strtoul(str, NULL, 10);
+ }
+ }
+
+ return 0;
+}
+
void
printfd(struct tcb *tcp, int fd)
{
char path[PATH_MAX + 1];
if (show_fd_path && getfdpath(tcp, fd, path, sizeof(path)) >= 0) {
- static const char socket_prefix[] = "socket:[";
- const size_t socket_prefix_len = sizeof(socket_prefix) - 1;
- const size_t path_len = strlen(path);
+ const char *str;
+ size_t len;
+ unsigned long inode;
tprintf("%d<", fd);
- if (show_fd_path > 1 &&
- strncmp(path, socket_prefix, socket_prefix_len) == 0 &&
- path[path_len - 1] == ']') {
- unsigned long inode =
- strtoul(path + socket_prefix_len, NULL, 10);
-
- if (!print_sockaddr_by_inode_cached(inode)) {
- const enum sock_proto proto =
- getfdproto(tcp, fd);
- if (!print_sockaddr_by_inode(inode, proto))
- tprints(path);
- }
- } else {
- print_quoted_string(path, path_len,
+ if (show_fd_path <= 1
+ || (str = STR_STRIP_PREFIX(path, "socket:[")) == path
+ || !(len = strlen(str))
+ || str[len - 1] != ']'
+ || !(inode = strtoul(str, NULL, 10))
+ || !print_sockaddr_by_inode(tcp, fd, inode)) {
+ print_quoted_string(path, strlen(path),
QUOTE_OMIT_LEADING_TRAILING_QUOTES);
}
tprints(">");
eol = 0x100; /* this can never match a char */
usehex = 0;
- if (xflag > 1)
+ if ((xflag > 1) || (style & QUOTE_FORCE_HEX)) {
usehex = 1;
- else if (xflag) {
+ } else if (xflag) {
/* Check for presence of symbol which require
to hex-quote the whole string. */
for (i = 0; i < size; ++i) {
* If path length exceeds `n', append `...' to the output.
*/
void
-printpathn(struct tcb *const tcp, const kernel_ureg_t addr, unsigned int n)
+printpathn(struct tcb *const tcp, const kernel_ulong_t addr, unsigned int n)
{
char path[PATH_MAX + 1];
int nul_seen;
}
/* Cap path length to the path buffer size */
- if (n > sizeof path - 1)
- n = sizeof path - 1;
+ if (n > sizeof(path) - 1)
+ n = sizeof(path) - 1;
/* Fetch one byte more to find out whether path length > n. */
nul_seen = umovestr(tcp, addr, n + 1, path);
}
void
-printpath(struct tcb *const tcp, const kernel_ureg_t addr)
+printpath(struct tcb *const tcp, const kernel_ulong_t addr)
{
/* Size must correspond to char path[] size in printpathn */
printpathn(tcp, addr, PATH_MAX);
* or QUOTE_0_TERMINATED bit is set and the string length exceeds `len'.
*/
void
-printstr_ex(struct tcb *const tcp, const kernel_ureg_t addr,
- const kernel_ureg_t len, const unsigned int user_style)
+printstr_ex(struct tcb *const tcp, const kernel_ulong_t addr,
+ const kernel_ulong_t len, const unsigned int user_style)
{
- static char *str = NULL;
+ static char *str;
static char *outstr;
+
unsigned int size;
unsigned int style = user_style;
int rc;
}
/* Allocate static buffers if they are not allocated yet. */
if (!str) {
- unsigned int outstr_size = 4 * max_strlen + /*for quotes and NUL:*/ 3;
+ const unsigned int outstr_size =
+ 4 * max_strlen + /* for quotes and NUL */ 3;
+ /*
+ * We can assume that outstr_size / 4 == max_strlen
+ * since we have a guarantee that max_strlen <= -1U / 4.
+ */
- if (outstr_size / 4 != max_strlen)
- die_out_of_memory();
str = xmalloc(max_strlen + 1);
outstr = xmalloc(outstr_size);
}
}
void
-dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ureg_t addr,
- kernel_ureg_t data_size)
+dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ulong_t addr,
+ kernel_ulong_t data_size)
{
-#if SUPPORTED_PERSONALITIES > 1
+#if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG
union {
struct { uint32_t base; uint32_t len; } *iov32;
struct { uint64_t base; uint64_t len; } *iov64;
#else
struct iovec *iov;
#define sizeof_iov sizeof(*iov)
-#define iov_iov_base(i) iov[i].iov_base
+#define iov_iov_base(i) ptr_to_kulong(iov[i].iov_base)
#define iov_iov_len(i) iov[i].iov_len
#endif
int i;
}
if (umoven(tcp, addr, size, iov) >= 0) {
for (i = 0; i < len; i++) {
- kernel_ureg_t iov_len = iov_iov_len(i);
+ kernel_ulong_t iov_len = iov_iov_len(i);
if (iov_len > data_size)
iov_len = data_size;
if (!iov_len)
data_size -= iov_len;
/* include the buffer number to make it easy to
* match up the trace with the source */
- tprintf(" * %lu bytes in buffer %d\n", iov_len, i);
- dumpstr(tcp, (kernel_ureg_t) iov_iov_base(i), iov_len);
+ tprintf(" * %" PRI_klu " bytes in buffer %d\n", iov_len, i);
+ dumpstr(tcp, iov_iov_base(i), iov_len);
}
}
free(iov);
}
void
-dumpstr(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
+dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
{
static int strsize = -1;
static unsigned char *str;
if (i < len) {
*dst++ = "0123456789abcdef"[*src >> 4];
*dst++ = "0123456789abcdef"[*src & 0xf];
- }
- else {
+ } else {
*dst++ = ' ';
*dst++ = ' ';
}
}
}
-#ifdef HAVE_PROCESS_VM_READV
-/* C library supports this, but the kernel might not. */
-static bool process_vm_readv_not_supported = 0;
-#else
+static bool process_vm_readv_not_supported;
-/* Need to do this since process_vm_readv() is not yet available in libc.
+#ifndef HAVE_PROCESS_VM_READV
+/*
+ * Need to do this since process_vm_readv() is not yet available in libc.
* When libc is be updated, only "static bool process_vm_readv_not_supported"
* line should remain.
*/
-#if !defined(__NR_process_vm_readv)
-# if defined(I386)
-# define __NR_process_vm_readv 347
-# elif defined(X86_64)
-# define __NR_process_vm_readv 310
-# elif defined(POWERPC)
-# define __NR_process_vm_readv 351
-# endif
-#endif
-
-#if defined(__NR_process_vm_readv)
-static bool process_vm_readv_not_supported = 0;
/* Have to avoid duplicating with the C library headers. */
static ssize_t strace_process_vm_readv(pid_t pid,
const struct iovec *lvec,
{
return syscall(__NR_process_vm_readv, (long)pid, lvec, liovcnt, rvec, riovcnt, flags);
}
-#define process_vm_readv strace_process_vm_readv
-#else
-static bool process_vm_readv_not_supported = 1;
-# define process_vm_readv(...) (errno = ENOSYS, -1)
-#endif
-
-#endif /* end of hack */
+# define process_vm_readv strace_process_vm_readv
+#endif /* !HAVE_PROCESS_VM_READV */
static ssize_t
vm_read_mem(const pid_t pid, void *const laddr,
- const kernel_ureg_t raddr, const size_t len)
+ const kernel_ulong_t raddr, const size_t len)
{
+ const unsigned long truncated_raddr = raddr;
+
+ if (raddr != (kernel_ulong_t) truncated_raddr) {
+ errno = EIO;
+ return -1;
+ }
+
const struct iovec local = {
.iov_base = laddr,
.iov_len = len
};
const struct iovec remote = {
- .iov_base = (void *) raddr,
+ .iov_base = (void *) truncated_raddr,
.iov_len = len
};
* at address `addr' to our space at `our_addr'
*/
int
-umoven(struct tcb *const tcp, kernel_ureg_t addr, unsigned int len,
+umoven(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len,
void *const our_addr)
{
char *laddr = our_addr;
char x[sizeof(long)];
} u;
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
- if (current_wordsize < sizeof(addr))
- addr &= (1ul << 8 * current_wordsize) - 1;
+#if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG
+ if (current_wordsize < sizeof(addr)
+ && (addr & (~(kernel_ulong_t) -1U))) {
+ return -1;
+ }
#endif
if (!process_vm_readv_not_supported) {
if ((unsigned int) r == len)
return 0;
if (r >= 0) {
- error_msg("umoven: short read (%u < %u) @0x%lx",
+ error_msg("umoven: short read (%u < %u) @0x%" PRI_klx,
(unsigned int) r, len, addr);
return -1;
}
n = addr & (sizeof(long) - 1); /* residue */
addr &= -sizeof(long); /* aligned address */
errno = 0;
- u.val = ptrace(PTRACE_PEEKDATA, pid, (void *) addr, 0);
+ u.val = ptrace(PTRACE_PEEKDATA, pid, addr, 0);
switch (errno) {
case 0:
break;
return -1;
default:
/* all the rest is strange and should be reported */
- perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%lx",
+ perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
pid, addr);
return -1;
}
}
while (len) {
errno = 0;
- u.val = ptrace(PTRACE_PEEKDATA, pid, (void *) addr, 0);
+ u.val = ptrace(PTRACE_PEEKDATA, pid, addr, 0);
switch (errno) {
case 0:
break;
case EFAULT: case EIO: case EPERM:
/* address space is inaccessible */
if (nread) {
- perror_msg("umoven: short read (%u < %u) @0x%lx",
+ perror_msg("umoven: short read (%u < %u) @0x%" PRI_klx,
nread, nread + len, addr - nread);
}
return -1;
default:
/* all the rest is strange and should be reported */
- perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%lx",
+ perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
pid, addr);
return -1;
}
}
int
-umoven_or_printaddr(struct tcb *const tcp, const kernel_ureg_t addr,
+umoven_or_printaddr(struct tcb *const tcp, const kernel_ulong_t addr,
const unsigned int len, void *const our_addr)
{
if (!addr || !verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
int
umoven_or_printaddr_ignore_syserror(struct tcb *const tcp,
- const kernel_ureg_t addr,
+ const kernel_ulong_t addr,
const unsigned int len,
void *const our_addr)
{
* we never write past laddr[len-1]).
*/
int
-umovestr(struct tcb *const tcp, kernel_ureg_t addr, unsigned int len, char *laddr)
+umovestr(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len, char *laddr)
{
const unsigned long x01010101 = (unsigned long) 0x0101010101010101ULL;
const unsigned long x80808080 = (unsigned long) 0x8080808080808080ULL;
char x[sizeof(long)];
} u;
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
- if (current_wordsize < sizeof(addr))
- addr &= (1ul << 8 * current_wordsize) - 1;
+#if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG
+ if (current_wordsize < sizeof(addr)
+ && (addr & (~(kernel_ulong_t) -1U))) {
+ return -1;
+ }
#endif
nread = 0;
case EFAULT: case EIO:
/* address space is inaccessible */
if (nread) {
- perror_msg("umovestr: short read (%d < %d) @0x%lx",
+ perror_msg("umovestr: short read (%d < %d) @0x%" PRI_klx,
nread, nread + len, addr - nread);
}
return -1;
n = addr & (sizeof(long) - 1); /* residue */
addr &= -sizeof(long); /* aligned address */
errno = 0;
- u.val = ptrace(PTRACE_PEEKDATA, pid, (void *) addr, 0);
+ u.val = ptrace(PTRACE_PEEKDATA, pid, addr, 0);
switch (errno) {
case 0:
break;
return -1;
default:
/* all the rest is strange and should be reported */
- perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%lx",
+ perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
pid, addr);
return -1;
}
while (len) {
errno = 0;
- u.val = ptrace(PTRACE_PEEKDATA, pid, (void *) addr, 0);
+ u.val = ptrace(PTRACE_PEEKDATA, pid, addr, 0);
switch (errno) {
case 0:
break;
case EFAULT: case EIO: case EPERM:
/* address space is inaccessible */
if (nread) {
- perror_msg("umovestr: short read (%d < %d) @0x%lx",
+ perror_msg("umovestr: short read (%d < %d) @0x%" PRI_klx,
nread, nread + len, addr - nread);
}
return -1;
default:
/* all the rest is strange and should be reported */
- perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%lx",
+ perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
pid, addr);
return -1;
}
*/
bool
print_array(struct tcb *const tcp,
- const kernel_ureg_t start_addr,
+ const kernel_ulong_t start_addr,
const size_t nmemb,
void *const elem_buf,
const size_t elem_size,
int (*const umoven_func)(struct tcb *,
- kernel_ureg_t,
+ kernel_ulong_t,
unsigned int,
void *),
bool (*const print_func)(struct tcb *,
}
const size_t size = nmemb * elem_size;
- const kernel_ureg_t end_addr = start_addr + size;
+ const kernel_ulong_t end_addr = start_addr + size;
if (end_addr <= start_addr || size / elem_size != nmemb) {
printaddr(start_addr);
return false;
}
- const kernel_ureg_t abbrev_end =
+ const kernel_ulong_t abbrev_end =
(abbrev(tcp) && max_strlen < nmemb) ?
start_addr + elem_size * max_strlen : end_addr;
- kernel_ureg_t cur;
+ kernel_ulong_t cur;
for (cur = start_addr; cur < end_addr; cur += elem_size) {
if (cur != start_addr)
return cur >= end_addr;
}
-kernel_ulong_t
-getarg_klu(struct tcb *tcp, int argn)
-{
-#if HAVE_STRUCT_TCB_EXT_ARG
-# ifndef current_klongsize
- if (current_klongsize < sizeof(*tcp->ext_arg)) {
- return tcp->u_arg[argn];
- } else
-# endif /* !current_klongsize */
- {
- return tcp->ext_arg[argn];
- }
-#else
- return tcp->u_arg[argn];
-#endif
-}
-
int
printargs(struct tcb *tcp)
{
const int n = tcp->s_ent->nargs;
int i;
for (i = 0; i < n; ++i)
- tprintf("%s%#" PRI_klx, i ? ", " : "", getarg_klu(tcp, i));
+ tprintf("%s%#" PRI_klx, i ? ", " : "", tcp->u_arg[i]);
return RVAL_DECODED;
}
return RVAL_DECODED;
}
+/* Print abnormal high bits of a kernel_ulong_t value. */
+void
+print_abnormal_hi(const kernel_ulong_t val)
+{
+ if (current_klongsize > 4) {
+ const unsigned int hi = (unsigned int) ((uint64_t) val >> 32);
+ if (hi)
+ tprintf("%#x<<32|", hi);
+ }
+}
+
#if defined _LARGEFILE64_SOURCE && defined HAVE_OPEN64
# define open_file open64
#else
projects / strace / blobdiff