diff options
author | Michael Pratt <mpratt@google.com> | 2019-04-11 16:47:26 -0700 |
---|---|---|
committer | Shentubot <shentubot@google.com> | 2019-04-11 16:48:39 -0700 |
commit | 6b24f7ab0863004a30c2f1aff88440fbb4cf3b3c (patch) | |
tree | 7c04c7ed9b35a06c1857609c54887a55ba0c70a4 /pkg/sentry/strace/syscalls.go | |
parent | efacb8d900cd7b5ca53e5a96b65ba78a368efc02 (diff) |
Format FDs in strace logs
Normal files display their path in the current mount namespace:
I0410 10:57:54.964196 216336 x:0] [ 1] ls X read(0x3 /proc/filesystems, 0x55cee3bdb2c0 "nodev\t9p\nnodev\tdevpts \nnodev\tdevtmpfs\nnodev\tproc\nnodev\tramdiskfs\nnodev\tsysfs\nnodev\ttmpfs\n", 0x1000) = 0x58 (24.462?s)
AT_FDCWD includes the CWD:
I0411 12:58:48.278427 1526 x:0] [ 1] stat_test E newfstatat(AT_FDCWD /home/prattmic, 0x55ea719b564e /proc/self, 0x7ef5cefc2be8, 0x0)
Sockets (and other non-vfs files) display an inode number (like
/proc/PID/fd):
I0410 10:54:38.909123 207684 x:0] [ 1] nc E bind(0x3 socket:[1], 0x55b5a1652040 {Family: AF_INET, Addr: , Port: 8080}, 0x10)
I also fixed a few syscall args that should be Path.
PiperOrigin-RevId: 243169025
Change-Id: Ic7dda6a82ae27062fe2a4a371557acfd6a21fa2a
Diffstat (limited to 'pkg/sentry/strace/syscalls.go')
-rw-r--r-- | pkg/sentry/strace/syscalls.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/sentry/strace/syscalls.go b/pkg/sentry/strace/syscalls.go index b2715856e..1f255c717 100644 --- a/pkg/sentry/strace/syscalls.go +++ b/pkg/sentry/strace/syscalls.go @@ -35,6 +35,9 @@ const ( // Oct is just an octal number. Oct + // FD is a file descriptor. + FD + // ReadBuffer is a buffer for a read-style call. The syscall return // value is used for the length. // |