strace/perf_ioctl.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

154 lines
3.9 KiB
C

/*
* Copyright (c) 2018 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"
#include <linux/ioctl.h>
#include "perf_event_struct.h"
#define XLAT_MACROS_ONLY
# include "xlat/perf_ioctl_cmds.h"
#undef XLAT_MACROS_ONLY
#include "xlat/perf_ioctl_flags.h"
#include MPERS_DEFS
static int
perf_ioctl_query_bpf(struct tcb *const tcp, const kernel_ulong_t arg)
{
uint32_t info;
if (entering(tcp)) {
tprints(", ");
if (umove_or_printaddr(tcp, arg, &info))
return RVAL_IOCTL_DECODED;
tprintf("{ids_len=%u, ", info);
return 0;
}
if (syserror(tcp) ||
umove(tcp, arg + offsetof(struct perf_event_query_bpf, prog_cnt),
&info)) {
tprints("...}");
return RVAL_IOCTL_DECODED;
}
tprintf("prog_cnt=%u, ids=", info);
print_array(tcp, arg + offsetof(struct perf_event_query_bpf, ids), info,
&info, sizeof(info),
tfetch_mem, print_uint32_array_member, NULL);
tprints("}");
return RVAL_IOCTL_DECODED;
}
static int
perf_ioctl_modify_attributes(struct tcb *const tcp, const kernel_ulong_t arg)
{
tprints(", ");
if (!fetch_perf_event_attr(tcp, arg))
print_perf_event_attr(tcp, arg);
return RVAL_IOCTL_DECODED;
}
MPERS_PRINTER_DECL(int, perf_ioctl,
struct tcb *const tcp, const unsigned int code,
const kernel_ulong_t arg)
{
switch (code) {
case PERF_EVENT_IOC_ENABLE:
case PERF_EVENT_IOC_DISABLE:
case PERF_EVENT_IOC_RESET:
tprints(", ");
printflags(perf_ioctl_flags, arg, "PERF_IOC_FLAG_???");
return RVAL_IOCTL_DECODED;
case PERF_EVENT_IOC_REFRESH:
tprintf(", %d", (int) arg);
return RVAL_IOCTL_DECODED;
case PERF_EVENT_IOC_PERIOD:
tprints(", ");
printnum_int64(tcp, arg, "%" PRIu64);
return RVAL_IOCTL_DECODED;
case PERF_EVENT_IOC_SET_OUTPUT:
case PERF_EVENT_IOC_SET_BPF:
tprintf(", ");
printfd(tcp, (int) arg);
return RVAL_IOCTL_DECODED;
case PERF_EVENT_IOC_PAUSE_OUTPUT:
tprintf(", %" PRI_klu, arg);
return RVAL_IOCTL_DECODED;
/*
* The following ioctl requests are personality-specific
* due to the pointer size.
*/
case PERF_EVENT_IOC_SET_FILTER:
tprints(", ");
printstr_ex(tcp, arg, get_pagesize(), QUOTE_0_TERMINATED);
return RVAL_IOCTL_DECODED;
case PERF_EVENT_IOC_ID:
if (entering(tcp)) {
tprints(", ");
return 0;
}
printnum_int64(tcp, arg, "%" PRIu64);
return RVAL_IOCTL_DECODED;
case PERF_EVENT_IOC_QUERY_BPF:
return perf_ioctl_query_bpf(tcp, arg);
case PERF_EVENT_IOC_MODIFY_ATTRIBUTES:
return perf_ioctl_modify_attributes(tcp, arg);
default:
return RVAL_DECODED;
}
}