strace/numa.c
Dmitry V. Levin d54388e1ce print_array: enhance printing of unfetchable object addresses
When umoven_func invocation fails to fetch data, it prints the faulty
address.  If this happens to a subsequent umoven_func invocation,
the printed address may be undistinguishable from a valid data printed
by print_func, e.g. when the data is printed in a numeric form like
[0x1, 0x2, 0x3, 0xdefaced].

Fix this source of confusion by moving the printing of the faulty
address from umoven_func to print_array itself.  This change renames
umoven_func to tfetch_mem_func and changes its semantics, so that
 - tfetch_mem_func never prints anything;
 - tfetch_mem_func returns true if the fetch succeeded,
   and false otherwise.

* defs.h (print_array): Replace umoven_func argument with
tfetch_mem_func.
* util.c (print_array): Replace umoven_func argument with
tfetch_mem_func, document expected tfetch_mem_func return value
semantics.  When tfetch_mem_func returns false, print either addr
or "... /* addr */" depending on the context (inside the array or not).
* bpf.c (print_ebpf_prog, print_bpf_prog_info,
BEGIN_BPF_CMD_DECODER(BPF_PROG_QUERY)): Replace umoven_or_printaddr
argument of print_array with tfetch_mem.
* bpf_filter.c (print_bpf_fprog): Likewise.
* btrfs.c (btrfs_print_logical_ino_container,
btrfs_print_ino_path_container, btrfs_print_qgroup_inherit,
btrfs_ioctl): Likewise.
* dm.c (dm_decode_dm_target_deps): Likewise.
* epoll.c (epoll_wait_common): Likewise.
* file_ioctl.c (file_ioctl): Likewise.
* ipc_sem.c (tprint_sembuf_array): Likewise.
* kexec.c (print_kexec_segments): Likewise.
* mem.c (SYS_FUNC(subpage_prot)): Likewise.
* net.c (print_getsockopt): Likewise.
* netlink.c (decode_nlmsgerr_attr_cookie): Likewise.
* netlink_netlink_diag.c (decode_netlink_diag_groups): Likewise.
* netlink_packet_diag.c (decode_packet_diag_mclist): Likewise.
* netlink_unix_diag.c (decode_unix_diag_inode): Likewise.
* nlattr.c (decode_nla_meminfo): Likewise.
* numa.c (print_nodemask, SYS_FUNC(move_pages),
* perf_ioctl.c (perf_ioctl_query_bpf): Likewise.
* poll.c (decode_poll_entering): Likewise.
* printsiginfo.c (print_siginfo_array): Likewise.
* rtnl_tc.c (decode_tca_stab_data): Likewise.
* sock.c (decode_ifconf): Likewise.
* uid.c (print_groups): Likewise.
* io.c (SYS_FUNC(io_submit), SYS_FUNC(io_getevents)): Replace
umoven_or_printaddr argument of print_array with tfetch_mem.
(tprint_iov_upto): Replace umoven_or_printaddr_ignore_syserror
with tfetch_mem_ignore_syserror.
* v4l2.c (print_v4l2_format_fmt): Replace umoven_or_printaddr argument
of print_array with tfetch_mem.
(print_v4l2_ext_controls): Replace umoven_or_printaddr_ignore_syserror
with tfetch_mem_ignore_syserror.
* mmsghdr.c (fetch_struct_mmsghdr_or_printaddr): Rename
to fetch_struct_mmsghdr_for_print, do not print address, return bool.
(decode_mmsgvec): Replace fetch_struct_mmsghdr_or_printaddr
with fetch_struct_mmsghdr_for_print.
* tests/aio.c (main): Update expected output.
* tests/bpf.c (print_BPF_PROG_QUERY_attr5): Likewise.
* tests/ioctl_perf-success.c (main): Likewise.
* tests/ioctl_v4l2.c (main): Update expected output.
* tests/kexec_load.c (main): Likewise.
* tests/mmsg_name.c (test_mmsg_name): Update expected output.
* tests/move_pages.c (print_page_array, print_node_array): Likewise.
* tests/poll.c (print_pollfd_array_entering): Likewise.
* tests/preadv-pwritev.c (main): Likewise.
* tests/preadv2-pwritev2.c (dumpio): Likewise.
* tests/process_vm_readv_writev.c (print_iov): Likewise.
* tests/pwritev.c (print_iovec): Likewise.
* tests/readv.c (main): Likewise.
* tests/seccomp-filter-v.c
* tests/semop.c (main): Likewise.
* tests/set_mempolicy.c (print_nodes): Likewise.
* tests/setgroups.c (main): Likewise.
* tests/test_nlattr.h (print_nlattr) Likewise.

Co-Authored-by: Eugene Syromyatnikov <evgsyr@gmail.com>
2018-05-29 09:58:10 +00:00

182 lines
4.9 KiB
C

/*
* Copyright (c) 2003-2007 Ulrich Drepper <drepper@redhat.com>
* Copyright (c) 2005-2016 Dmitry V. Levin <ldv@altlinux.org>
* Copyright (c) 2016-2017 The strace developers.
* 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"
static bool
print_node(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
{
if (elem_size < sizeof(kernel_ulong_t)) {
tprintf("%#0*x", (int) elem_size * 2 + 2,
*(unsigned int *) elem_buf);
} else {
tprintf("%#0*" PRI_klx, (int) elem_size * 2 + 2,
*(kernel_ulong_t *) elem_buf);
}
return true;
}
static void
print_nodemask(struct tcb *const tcp, const kernel_ulong_t addr,
const kernel_ulong_t maxnodes)
{
const unsigned int bits_per_long = 8 * current_wordsize;
const kernel_ulong_t nmemb =
(maxnodes + bits_per_long - 2) / bits_per_long;
if (nmemb < maxnodes / bits_per_long ||
(maxnodes && !nmemb)) {
printaddr(addr);
return;
}
kernel_ulong_t buf;
print_array(tcp, addr, nmemb, &buf, current_wordsize,
tfetch_mem, print_node, 0);
}
SYS_FUNC(migrate_pages)
{
tprintf("%d, %" PRI_klu ", ", (int) tcp->u_arg[0], tcp->u_arg[1]);
print_nodemask(tcp, tcp->u_arg[2], tcp->u_arg[1]);
tprints(", ");
print_nodemask(tcp, tcp->u_arg[3], tcp->u_arg[1]);
return RVAL_DECODED;
}
#include "xlat/policies.h"
#include "xlat/mbindflags.h"
SYS_FUNC(mbind)
{
printaddr(tcp->u_arg[0]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
printxval64(policies, tcp->u_arg[2], "MPOL_???");
tprints(", ");
print_nodemask(tcp, tcp->u_arg[3], tcp->u_arg[4]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[4]);
printflags(mbindflags, tcp->u_arg[5], "MPOL_???");
return RVAL_DECODED;
}
SYS_FUNC(set_mempolicy)
{
printxval(policies, tcp->u_arg[0], "MPOL_???");
tprints(", ");
print_nodemask(tcp, tcp->u_arg[1], tcp->u_arg[2]);
tprintf(", %" PRI_klu, tcp->u_arg[2]);
return RVAL_DECODED;
}
#include "xlat/mempolicyflags.h"
SYS_FUNC(get_mempolicy)
{
if (exiting(tcp)) {
int pol;
if (!umove_or_printaddr(tcp, tcp->u_arg[0], &pol)) {
tprints("[");
printxval(policies, pol, "MPOL_???");
tprints("]");
}
tprints(", ");
print_nodemask(tcp, tcp->u_arg[1], tcp->u_arg[2]);
tprintf(", %" PRI_klu ", ", tcp->u_arg[2]);
printaddr(tcp->u_arg[3]);
tprints(", ");
printflags64(mempolicyflags, tcp->u_arg[4], "MPOL_???");
}
return 0;
}
#include "xlat/move_pages_flags.h"
static bool
print_addr(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
{
kernel_ulong_t addr;
if (elem_size < sizeof(addr)) {
addr = *(unsigned int *) elem_buf;
} else {
addr = *(kernel_ulong_t *) elem_buf;
}
printaddr(addr);
return true;
}
static bool
print_status(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
{
const int status = *(int *) elem_buf;
if (status < 0 && (unsigned) -status < nerrnos)
tprintf("-%s", errnoent[-status]);
else
tprintf("%d", status);
return true;
}
static bool
print_int(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
{
tprintf("%d", *(int *) elem_buf);
return true;
}
SYS_FUNC(move_pages)
{
const kernel_ulong_t npages = tcp->u_arg[1];
kernel_ulong_t buf;
if (entering(tcp)) {
tprintf("%d, %" PRI_klu ", ", (int) tcp->u_arg[0], npages);
print_array(tcp, tcp->u_arg[2], npages, &buf, current_wordsize,
tfetch_mem, print_addr, 0);
tprints(", ");
print_array(tcp, tcp->u_arg[3], npages, &buf, sizeof(int),
tfetch_mem, print_int, 0);
tprints(", ");
} else {
print_array(tcp, tcp->u_arg[4], npages, &buf, sizeof(int),
tfetch_mem, print_status, 0);
tprints(", ");
printflags(move_pages_flags, tcp->u_arg[5], "MPOL_???");
}
return 0;
}