linux-user: strace improvements
v2 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 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
$ 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:[0010] [FC] 'linux-user/strace: Dump AF_NETLINK sockaddr content' 002/12:[down] 'linux-user/strace: Let print_sockaddr() have a 'last' argument' 003/12:[0002] [FC] 'linux-user/strace: Improve sendto() output'
004/12:[0036] [FC] 'linux-user/strace: Add print_sockaddr_ptr() to handle plain/pointer addrlen' 005/12:[0002] [FC] 'linux-user/strace: Improve recvfrom() output'
006/12:[0002] [FC] 'linux-user/strace: Improve getsockname() output' 007/12:[----] [--] 'linux-user/strace: Improve recvmsg() output'
008/12:[0002] [FC] 'linux-user/strace: Improve bind() output'
009/12:[down] 'linux-user/strace: Add print_timezone()'
010/12:[0016] [FC] 'linux-user/strace: Improve gettimeofday() and settimeofday() output' 011/12:[----] [--] 'linux-user/strace: Improve capget()/capset() output' 012/12:[----] [--] 'linux-user/syscall: Verify recvfrom(addr) is user-writable'
Philippe Mathieu-Daudé (12):
linux-user/syscall: Verify recvfrom(addr) is user-writable linux-user/strace: Improve capget()/capset() output linux-user/strace: Add print_timezone()
linux-user/strace: Improve gettimeofday() and settimeofday() output linux-user/strace: Dump AF_NETLINK sockaddr content linux-user/strace: Improve recvmsg() output
linux-user/strace: Improve bind() output
linux-user/strace: improve sendto() output
linux-user/strace: Let print_sockaddr() have a 'last' argument linux-user/strace: Add print_sockaddr_ptr() to handle plain/pointer addrlen linux-user/strace: Improve getsockname() output linux-user/strace: Improve recvfrom() output
linux-user/syscall_defs.h | 7 ++ linux-user/strace.c | 159 ++++++++++++++++++++++++++++++++++++-- linux-user/syscall.c | 11 ++- linux-user/strace.list | 18 ++--- 4 files changed, 179 insertions(+), 16 deletions(-)
Signature · 1 line
2.18.0
PATCH v2 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 v2 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 v2 4/12 linux-user/strace: Improve gettimeofday() and settimeofday() output
In reply to Philippe Mathieu-Daudé--- linux-user/strace.c | 13 +++++++++++++ linux-user/strace.list | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-)
linux-user/strace.c +13 -0
@@ -1499,6 +1499,19 @@ print_futimesat(const struct syscallname *name, }#endif +#if defined(TARGET_NR_gettimeofday) || defined(TARGET_NR_settimeofday) +static void +print_timeofday (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 +2 -2
@@ -384,7 +384,7 @@ { TARGET_NR_gettid, "gettid" , "%s()", NULL, NULL }, #endif #ifdef TARGET_NR_gettimeofday -{ TARGET_NR_gettimeofday, "gettimeofday" , NULL, NULL, NULL }, +{ TARGET_NR_gettimeofday, "gettimeofday" , NULL, print_timeofday, NULL }, #endif #ifdef TARGET_NR_getuid { TARGET_NR_getuid, "getuid" , "%s()", NULL, NULL },
@@ -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_timeofday, NULL }, #endif #ifdef TARGET_NR_setuid { TARGET_NR_setuid, "setuid" , NULL, NULL, NULL },
Signature · 1 line
2.18.0
Re: [Qemu-devel] [PATCH v2 04/12] linux-user/strace: Improve gettimeofday() and settimeofday() output
Le 28/06/2018 à 05:46, Philippe Mathieu-Daudé a écrit :
Quoted 36 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>Tested-by Guido Günther <[email protected]>--- linux-user/strace.c | 13 +++++++++++++ linux-user/strace.list | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-)linux-user/strace.c +13
-0@@ -1499,6 +1499,19 @@ print_futimesat(const struct syscallname *name, }#endif +#if defined(TARGET_NR_gettimeofday) || defined(TARGET_NR_settimeofday) +static void +print_timeofday (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 +0
-0
linux-user/strace.list line 387
Quoted 5 lines
linux-user/strace.list +1
-1@@ -384,7 +384,7 @@ { TARGET_NR_gettid, "gettid" , "%s()", NULL, NULL }, #endif #ifdef TARGET_NR_gettimeofday -{ TARGET_NR_gettimeofday, "gettimeofday" , NULL, NULL, NULL }, +{ TARGET_NR_gettimeofday, "gettimeofday" , NULL, print_timeofday, NULL },
print_timeofday() will be called before the call of gettimeofday() so I don't think the values you will print here have any meaning.
Thanks,
Laurent
PATCH v2 5/12 linux-user/strace: Dump AF_NETLINK sockaddr content
In reply to Philippe Mathieu-Daudé--- linux-user/syscall_defs.h | 7 +++++++ linux-user/strace.c | 34 ++++++++++++++++++++++++++++++++++ linux-user/syscall.c | 6 ++++-- 3 files changed, 45 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/strace.c +34 -0
@@ -8,6 +8,7 @@#include <arpa/inet.h> #include <netinet/tcp.h> #include <linux/if_packet.h> +#include <linux/netlink.h> #include <sched.h> #include "qemu.h"
@@ -398,6 +399,12 @@ print_sockaddr(abi_ulong addr, abi_long addrlen)gemu_log ("}" );break ; } +case AF_NETLINK : { +struct target_sockaddr_nl *nl = (struct target_sockaddr_nl *)sa; +gemu_log ("{nl_family=AF_NETLINK,nl_pid=%u,nl_groups=%u}" , + nl->nl_pid, nl->nl_groups); +break ; + }default :gemu_log ("{sa_family=%d, sa_data={" , sa->sa_family);for (i =0 ; i <13 ; i++) {
@@ -424,6 +431,9 @@ print_socket_domain(int domain)case PF_INET :gemu_log ("PF_INET" );break ; +case PF_NETLINK : +gemu_log ("PF_NETLINK" ); +break ;case PF_PACKET :gemu_log ("PF_PACKET" );break ;
@@ -473,6 +483,30 @@ print_socket_protocol(int domain, int type, int protocol)return ; } +if (domain ==AF_NETLINK ) { +switch (protocol) { +case NETLINK_ROUTE : +gemu_log ("NETLINK_ROUTE" ); +break ; +case NETLINK_AUDIT : +gemu_log ("NETLINK_AUDIT" ); +break ; +case NETLINK_NETFILTER : +gemu_log ("NETLINK_NETFILTER" ); +break ; +case NETLINK_RDMA : +gemu_log ("NETLINK_RDMA" ); +break ; +case NETLINK_CRYPTO : +gemu_log ("NETLINK_CRYPTO" ); +break ; +default : +gemu_log ("%d" , protocol); +break ; + } +return ; + } +switch (protocol) {case IPPROTO_IP :gemu_log ("IPPROTO_IP" );
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 v2 6/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 v2 9/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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
linux-user/strace.c +7 -7
@@ -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
@@ -1655,7 +1655,7 @@ static void do_print_sockaddr(const char *name, abi_long arg1)gemu_log ("%s(" , name);print_raw_param (TARGET_ABI_FMT_ld, sockfd,0 ); -print_sockaddr (addr, addrlen); +print_sockaddr (addr, addrlen,0 );gemu_log (")" ); }
@@ -1725,7 +1725,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 (")" ); }
@@ -1963,7 +1963,7 @@ print_bind(const struct syscallname *name, {print_syscall_prologue (name);print_raw_param ("%d" , arg0,0 ); -print_sockaddr (arg1, arg2); +print_sockaddr (arg1, arg2,1 );print_syscall_epilogue (name); }#endif
@@ -1979,7 +1979,7 @@ print_sendto(const struct syscallname *name,print_buf (arg1, arg2,0 );print_raw_param (TARGET_ABI_FMT_ld, arg2,0 );print_flags (msg_flags, arg3,0 ); -print_sockaddr (arg4, arg5); +print_sockaddr (arg4, arg5,1 ); print_syscall_epilogue(name); }#endif
Signature · 1 line
2.18.0
RFC PATCH v2 10/12 linux-user/strace: Add print_sockaddr_ptr() to handle plain/pointer addrlen
In reply to Philippe Mathieu-DaudéWhile very similar to send()/recv(), the format used by sendto()/recvfrom() is slightly different: the 'addrlen' is not a plain sockaddr_t but a pointer to it.
Split the current function to handle both formats.
--- linux-user/strace.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
linux-user/strace.c +26 -2
@@ -68,6 +68,7 @@ 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, int); +UNUSED static void print_sockaddr_ptr(abi_ulong addr, abi_long addrlen_ptr, 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 +337,8 @@ static void print_siginfo(const target_siginfo_t *tinfo) }static void -print_sockaddr (abi_ulong addr,abi_long addrlen,int last) +print_sockaddr_ex (abi_ulong addr,abi_long addrlen, +bool addrlen_is_ptr,int last) {struct target_sockaddr *sa;int i;
@@ -418,7 +420,29 @@ print_sockaddr(abi_ulong addr, abi_long addrlen, int last) }else {print_raw_param ("0x" TARGET_ABI_FMT_lx, addr,0 ); } -gemu_log (", " TARGET_ABI_FMT_ld"%s" , addrlen,get_comma (last)); +gemu_log (", %s" TARGET_ABI_FMT_ld"%s%s" , + (addrlen_is_ptr ?"[" :"" ), addrlen, + (addrlen_is_ptr ?"]" :"" ),get_comma (last)); +} + +static void +print_sockaddr (abi_ulong addr,abi_long addrlen,int last) +{ +print_sockaddr_ex (addr, addrlen, false, last); +} + +static void +print_sockaddr_ptr (abi_ulong addr,abi_long addrlen_ptr,int last) +{ +abi_ulong addrlen; + +if (!addr) { +print_sockaddr_ex (0 ,0 , false, last); +return ; + } + +get_user_ual (addrlen, addrlen_ptr); +print_sockaddr_ex (addr, addrlen, true, last); } static void
Signature · 1 line
2.18.0
PATCH v2 11/12 linux-user/strace: Improve getsockname() output
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
@@ -1992,6 +1992,19 @@ print_bind(const struct syscallname *name, }#endif +#if defined(TARGET_NR_getsockname) +static void +print_getsockname (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_raw_param ("%d" , arg0,0 ); +print_sockaddr_ptr (arg1, arg2,1 ); +print_syscall_epilogue (name); +} +#endif +#if defined(TARGET_NR_sendto) static void print_sendto(const struct syscallname *name,
linux-user/strace.list +1 -1
@@ -371,7 +371,7 @@ { TARGET_NR_getsid, "getsid" , NULL, NULL, NULL }, #endif #ifdef TARGET_NR_getsockname -{ TARGET_NR_getsockname, "getsockname" , NULL, NULL, NULL }, +{ TARGET_NR_getsockname, "getsockname" , NULL, print_getsockname, NULL }, #endif #ifdef TARGET_NR_getsockopt { TARGET_NR_getsockopt, "getsockopt" , NULL, NULL, NULL },
Signature · 1 line
2.18.0
PATCH v2 12/12 linux-user/strace: Improve recvfrom() output
In reply to Philippe Mathieu-Daudé--- linux-user/strace.c | 16 ++++++++++++++++ linux-user/strace.list | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-)
linux-user/strace.c +16 -0
@@ -2005,6 +2005,22 @@ print_getsockname(const struct syscallname *name, }#endif +#if defined(TARGET_NR_recvfrom) +static void +print_recvfrom (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_raw_param ("%d" , arg0,0 ); +print_buf (arg1, arg2,0 ); +print_raw_param (TARGET_ABI_FMT_ld, arg2,0 ); +print_flags (msg_flags, arg3,0 ); +print_sockaddr_ptr (arg4, arg5,1 ); +print_syscall_epilogue (name); +} +#endif +#if defined(TARGET_NR_sendto) static void print_sendto(const struct syscallname *name,
linux-user/strace.list +1 -1
@@ -1101,7 +1101,7 @@ { TARGET_NR_recv, "recv" , NULL, NULL, NULL }, #endif #ifdef TARGET_NR_recvfrom -{ TARGET_NR_recvfrom, "recvfrom" , NULL, NULL, NULL }, +{ TARGET_NR_recvfrom, "recvfrom" , NULL, print_recvfrom, NULL }, #endif #ifdef TARGET_NR_recvmmsg { TARGET_NR_recvmmsg, "recvmmsg" , NULL, NULL, NULL },
Signature · 1 line
2.18.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [Qemu-devel] [PATCH v2 03/12] linux-user/strace: Add print_timezone()
Le 28/06/2018 à 05:46, Philippe Mathieu-Daudé a écrit :
Quoted 20 lines
Suggested-by Laurent Vivier <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- linux-user/strace.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)linux-user/strace.c +1
-0@@ -63,6 +63,7 @@ UNUSED static void print_string(abi_long, int); UNUSED static void print_buf(abi_long addr, abi_long len, int last); UNUSED static void print_raw_param(const char *, abi_long, int); 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);@@ -1182,6 +1183,25 @@ print_timeval(abi_ulong tv_addr, int last)gemu_log ("NULL%s" ,get_comma (last));
linux-user/strace.c print_timeval(abi_ulong tv_addr, int last) · line 1193
Quoted 10 lines
linux-user/strace.c +8
-0} +static void +print_timezone (abi_ulong tz_addr,int last) +{ +if (tz_addr) { +struct target_timezone *tz; + + tz =lock_user (VERIFY_READ , tz_addr,sizeof (*tz),1 ); +if (!tz) {
you should use print_pointer(tz_addr, last) instead of ignoring the value.
Thanks,
Laurent
Re: [Qemu-devel] [PATCH v2 03/12] linux-user/strace: Add print_timezone()
Quoted 23 lines · Laurent Vivier
Le 28/06/2018 à 05:46, Philippe Mathieu-Daudé a écrit :
Quoted 22 lines
Suggested-by Laurent Vivier <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- linux-user/strace.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)linux-user/strace.c +1
-0@@ -63,6 +63,7 @@ UNUSED static void print_string(abi_long, int); UNUSED static void print_buf(abi_long addr, abi_long len, int last); UNUSED static void print_raw_param(const char *, abi_long, int); 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);@@ -1182,6 +1183,25 @@ print_timeval(abi_ulong tv_addr, int last)gemu_log ("NULL%s" ,get_comma (last)); }
Quoted 10 lines
linux-user/strace.c print_timeval(abi_ulong tv_addr, int last) · line 1193
Quoted 8 lines
linux-user/strace.c +8
-0+static void +print_timezone (abi_ulong tz_addr,int last) +{ +if (tz_addr) { +struct target_timezone *tz; + + tz =lock_user (VERIFY_READ , tz_addr,sizeof (*tz),1 ); +if (!tz) {you should use
print_pointer(tz_addr, last)instead of ignoring the value.
I copied print_timeval(). Same applies there then. I'll update both.
Thanks,
Phil.