linux-user: strace improvements
v4 cover linux-user: strace improvements
Hi Laurent,
Few patches I'v been writting while trying to figure out this issue:
http://lists.nongnu.org/archive/html/qemu-arm/2018-01/msg00514.html
As usual with linux-user files, this series will trigger some checkpatch benign warnings.
Regards,
Phil.
Since v3:
- addressed Laurent comments
- added print_sockfd()
- removed the print_sockaddr_ptr() patch, also the two getsockname()/recvfrom() patches for after 3.0.
Since v2:
- display invalid pointer in print_timeval() and print_timezone()
- do not display gettimeofday() arguments
Since v1:
- addressed Laurent comments
- added 'last' argument to print_sockaddr()
- reordered series, so patches already correct can get applied directly
- dropped "linux-user/syscall: simplify recvfrom()" for now
v1: http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg05855.html
v2: http://lists.nongnu.org/archive/html/qemu-devel/2018-06/msg08216.html
v3: http://lists.nongnu.org/archive/html/qemu-devel/2018-07/msg00411.html
$ git backport-diff [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/12:[----] [--] 'linux-user/syscall: Verify recvfrom(addr) is user-writable' 002/12:[----] [--] 'linux-user/strace: Improve capget()/capset() output' 003/12:[0002] [FC] 'linux-user/strace: Display invalid pointer in print_timeval()' 004/12:[0002] [FC] 'linux-user/strace: Add print_timezone()' 005/12:[----] [--] 'linux-user/strace: Improve settimeofday()' 006/12:[down] 'linux-user/syscall: Introduce target_sockaddr_nl' 007/12:[0018] [FC] 'linux-user/strace: Dump AF_NETLINK sockaddr content' 008/12:[----] [--] 'linux-user/strace: Improve recvmsg() output' 009/12:[down] 'linux-user/strace: Add print_sockfd()'
010/12:[0004] [FC] 'linux-user/strace: Let print_sockaddr() have a 'last' argument' 011/12:[0004] [FC] 'linux-user/strace: Improve bind() output' 012/12:[0004] [FC] 'linux-user/strace: improve sendto() output'
Philippe Mathieu-Daudé (12):
linux-user/syscall: Verify recvfrom(addr) is user-writable linux-user/strace: Improve capget()/capset() output linux-user/strace: Display invalid pointer in print_timeval() linux-user/strace: Add print_timezone() linux-user/strace: Improve settimeofday() linux-user/syscall: Introduce target_sockaddr_nl linux-user/strace: Dump AF_NETLINK sockaddr content linux-user/strace: Improve recvmsg() output linux-user/strace: Add print_sockfd() linux-user/strace: Let print_sockaddr() have a 'last' argument linux-user/strace: Improve bind() output linux-user/strace: improve sendto() output
linux-user/syscall_defs.h | 7 ++ linux-user/strace.c | 133 ++++++++++++++++++++++++++++++++++---- linux-user/syscall.c | 11 +++- linux-user/strace.list | 12 ++-- 4 files changed, 142 insertions(+), 21 deletions(-)
Signature · 1 line
2.18.0
PATCH v4 1/12 linux-user/syscall: Verify recvfrom(addr) is user-writable
--- linux-user/syscall.c | 5 +++++ 1 file changed, 5 insertions(+)
linux-user/syscall.c +5 -0
@@ -4154,6 +4154,11 @@ static abi_long do_recvfrom(int fd, abi_ulong msg, size_t len, int flags, ret = -TARGET_EINVAL ; goto fail; } +if (!access_ok (VERIFY_WRITE , target_addr, addrlen)) { + ret = -TARGET_EFAULT ; + goto fail; + } + addr =alloca (addrlen); ret =get_errno (safe_recvfrom (fd, host_msg, len, flags, addr, &addrlen));
Signature · 1 line
2.18.0
PATCH v4 2/12 linux-user/strace: Improve capget()/capset() output
In reply to Philippe Mathieu-Daudé--- linux-user/strace.list | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
linux-user/strace.list +2 -2
@@ -59,10 +59,10 @@ { TARGET_NR_cacheflush, "cacheflush" , NULL, NULL, NULL }, #endif #ifdef TARGET_NR_capget -{ TARGET_NR_capget, "capget" , NULL, NULL, NULL }, +{ TARGET_NR_capget, "capget" , "%s(%p,%p)", NULL, NULL }, #endif #ifdef TARGET_NR_capset -{ TARGET_NR_capset, "capset" , NULL, NULL, NULL }, +{ TARGET_NR_capset, "capset" , "%s(%p,%p)", NULL, NULL }, #endif #ifdef TARGET_NR_chdir { TARGET_NR_chdir, "chdir" , NULL, print_chdir, NULL },
Signature · 1 line
2.18.0
PATCH v4 5/12 linux-user/strace: Improve settimeofday()
In reply to Philippe Mathieu-Daudé--- linux-user/strace.c | 13 +++++++++++++ linux-user/strace.list | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-)
linux-user/strace.c +13 -0
@@ -1502,6 +1502,19 @@ print_futimesat(const struct syscallname *name, }#endif +#ifdef TARGET_NR_settimeofday +static void +print_settimeofday (const struct syscallname *name, +abi_long arg0,abi_long arg1,abi_long arg2, +abi_long arg3,abi_long arg4,abi_long arg5) +{ +print_syscall_prologue (name); +print_timeval (arg0,0 ); +print_timezone (arg1,1 ); +print_syscall_epilogue (name); +} +#endif +#ifdef TARGET_NR_link static void print_link(const struct syscallname *name,
linux-user/strace.list +1 -1
@@ -1345,7 +1345,7 @@ { TARGET_NR_set_tid_address, "set_tid_address" , NULL, NULL, NULL }, #endif #ifdef TARGET_NR_settimeofday -{ TARGET_NR_settimeofday, "settimeofday" , NULL, NULL, NULL }, +{ TARGET_NR_settimeofday, "settimeofday" , NULL, print_settimeofday, NULL }, #endif #ifdef TARGET_NR_setuid { TARGET_NR_setuid, "setuid" , NULL, NULL, NULL },
Signature · 1 line
2.18.0
PATCH v4 6/12 linux-user/syscall: Introduce target_sockaddr_nl
In reply to Philippe Mathieu-Daudé--- linux-user/syscall_defs.h | 7 +++++++ linux-user/syscall.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-)
linux-user/syscall_defs.h +7 -0
@@ -152,6 +152,13 @@ struct target_sockaddr_un {uint8_t sun_path[108 ]; }; +struct target_sockaddr_nl { +uint16_t nl_family;/* AF_NETLINK */ +uint16_t __pad; +uint32_t nl_pid; +uint32_t nl_groups; +}; +struct target_in_addr {uint32_t s_addr;/* big endian */ };
linux-user/syscall.c +4 -2
@@ -1696,8 +1696,10 @@ static inline abi_long host_to_target_sockaddr(abi_ulong target_addr, sizeof(target_saddr->sa_family)) { target_saddr->sa_family =tswap16 (addr->sa_family); } -if (addr->sa_family ==AF_NETLINK && len >=sizeof (struct sockaddr_nl )) { -struct sockaddr_nl *target_nl = (struct sockaddr_nl *)target_saddr; +if (addr->sa_family ==AF_NETLINK && + len >=sizeof (struct target_sockaddr_nl )) { +struct target_sockaddr_nl *target_nl = + (struct target_sockaddr_nl *)target_saddr; target_nl->nl_pid =tswap32 (target_nl->nl_pid); target_nl->nl_groups =tswap32 (target_nl->nl_groups); }else if (addr->sa_family ==AF_PACKET ) {
Signature · 1 line
2.18.0
PATCH v4 8/12 linux-user/strace: Improve recvmsg() output
In reply to Philippe Mathieu-Daudé--- linux-user/strace.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
linux-user/strace.list +1 -1
@@ -1107,7 +1107,7 @@ { TARGET_NR_recvmmsg, "recvmmsg" , NULL, NULL, NULL }, #endif #ifdef TARGET_NR_recvmsg -{ TARGET_NR_recvmsg, "recvmsg" , NULL, NULL, NULL }, +{ TARGET_NR_recvmsg, "recvmsg" , "%s(%d,%p,%#x)", NULL, NULL }, #endif #ifdef TARGET_NR_remap_file_pages { TARGET_NR_remap_file_pages, "remap_file_pages" , NULL, NULL, NULL },
Signature · 1 line
2.18.0
PATCH v4 9/12 linux-user/strace: Add print_sockfd()
In reply to Philippe Mathieu-DaudéExtract common print_sockfd() from various socket related syscalls.
--- linux-user/strace.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
linux-user/strace.c +12 -7
@@ -1651,6 +1651,11 @@ static void do_print_socket(const char *name, abi_long arg1)gemu_log (")" ); } +static void print_sockfd (abi_long sockfd,int last) +{ +print_raw_param (TARGET_ABI_FMT_ld, sockfd, last); +} +static void do_print_sockaddr (const char *name,abi_long arg1) {abi_ulong sockfd, addr, addrlen;
@@ -1660,7 +1665,7 @@ static void do_print_sockaddr(const char *name, abi_long arg1)get_user_ualx (addrlen, arg1,2 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_sockaddr (addr, addrlen);gemu_log (")" ); }
@@ -1673,7 +1678,7 @@ static void do_print_listen(const char *name, abi_long arg1)get_user_ualx (backlog, arg1,1 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_raw_param (TARGET_ABI_FMT_ld, backlog,1 );gemu_log (")" ); }
@@ -1708,7 +1713,7 @@ static void do_print_sendrecv(const char *name, abi_long arg1)get_user_ualx (flags, arg1,3 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_buf (msg, len,0 );print_raw_param (TARGET_ABI_FMT_ld, len,0 );print_flags (msg_flags, flags,1 );
@@ -1727,7 +1732,7 @@ static void do_print_msgaddr(const char *name, abi_long arg1)get_user_ualx (addrlen, arg1,5 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_buf (msg, len,0 );print_raw_param (TARGET_ABI_FMT_ld, len,0 );print_flags (msg_flags, flags,0 );
@@ -1743,7 +1748,7 @@ static void do_print_shutdown(const char *name, abi_long arg1)get_user_ualx (how, arg1,1 );gemu_log ("shutdown(" ); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );switch (how) {case SHUT_RD :gemu_log ("SHUT_RD" );
@@ -1770,7 +1775,7 @@ static void do_print_msg(const char *name, abi_long arg1)get_user_ualx (flags, arg1,2 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );print_pointer (msg,0 );print_flags (msg_flags, flags,1 );gemu_log (")" );
@@ -1787,7 +1792,7 @@ static void do_print_sockopt(const char *name, abi_long arg1)get_user_ualx (optlen, arg1,4 );gemu_log ("%s(" , name); -print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); +print_sockfd (sockfd,0 );switch (level) {case SOL_TCP :gemu_log ("SOL_TCP," );
Signature · 1 line
2.18.0
PATCH v4 10/12 linux-user/strace: Let print_sockaddr() have a 'last' argument
In reply to Philippe Mathieu-DaudéIf the format is not the syscall last argument, a comma is append.
--- linux-user/strace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
linux-user/strace.c +5 -5
@@ -67,7 +67,7 @@ UNUSED static void print_timeval(abi_ulong, int); UNUSED static void print_timezone(abi_ulong, int); UNUSED static void print_number(abi_long, int); UNUSED static void print_signal(abi_ulong, int); -UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen); +UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen, int); UNUSED static void print_socket_domain(int domain); UNUSED static void print_socket_type(int type); UNUSED static void print_socket_protocol(int domain, int type, int protocol);
@@ -336,7 +336,7 @@ static void print_siginfo(const target_siginfo_t *tinfo) }static void -print_sockaddr (abi_ulong addr,abi_long addrlen) +print_sockaddr (abi_ulong addr,abi_long addrlen,int last) {struct target_sockaddr *sa;int i;
@@ -418,7 +418,7 @@ print_sockaddr(abi_ulong addr, abi_long addrlen) }else {print_raw_param ("0x" TARGET_ABI_FMT_lx, addr,0 ); } -gemu_log (", " TARGET_ABI_FMT_ld, addrlen); +gemu_log (", " TARGET_ABI_FMT_ld"%s" , addrlen,get_comma (last)); } static void
@@ -1666,7 +1666,7 @@ static void do_print_sockaddr(const char *name, abi_long arg1)gemu_log ("%s(" , name);print_sockfd (sockfd,0 ); -print_sockaddr (addr, addrlen); +print_sockaddr (addr, addrlen,0 );gemu_log (")" ); }
@@ -1736,7 +1736,7 @@ static void do_print_msgaddr(const char *name, abi_long arg1)print_buf (msg, len,0 );print_raw_param (TARGET_ABI_FMT_ld, len,0 );print_flags (msg_flags, flags,0 ); -print_sockaddr (addr, addrlen); +print_sockaddr (addr, addrlen,0 );gemu_log (")" ); }
Signature · 1 line
2.18.0