From c1111baf6cc0d9ad845be8e8de240e836ada5ffa Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Thu, 23 Jun 2022 13:31:44 -0700 Subject: [PATCH] Allow strace logs for symlinkat(2) to print FD. Helps with debugging issues that involve symlinkat(2). FD also prints the path file that the FD backs which is helpful. PiperOrigin-RevId: 456849268 --- pkg/sentry/strace/linux64_amd64.go | 2 +- pkg/sentry/strace/linux64_arm64.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/sentry/strace/linux64_amd64.go b/pkg/sentry/strace/linux64_amd64.go index 09589fc41..3be030bc0 100644 --- a/pkg/sentry/strace/linux64_amd64.go +++ b/pkg/sentry/strace/linux64_amd64.go @@ -291,7 +291,7 @@ var linuxAMD64 = SyscallMap{ 263: makeSyscallInfo("unlinkat", FD, Path, Hex), 264: makeSyscallInfo("renameat", FD, Path, Hex, Path), 265: makeSyscallInfo("linkat", FD, Path, Hex, Path, Hex), - 266: makeSyscallInfo("symlinkat", Path, Hex, Path), + 266: makeSyscallInfo("symlinkat", Path, FD, Path), 267: makeSyscallInfo("readlinkat", FD, Path, ReadBuffer, Hex), 268: makeSyscallInfo("fchmodat", FD, Path, Mode), 269: makeSyscallInfo("faccessat", FD, Path, Oct, Hex), diff --git a/pkg/sentry/strace/linux64_arm64.go b/pkg/sentry/strace/linux64_arm64.go index 5f529c1f3..f07e12aae 100644 --- a/pkg/sentry/strace/linux64_arm64.go +++ b/pkg/sentry/strace/linux64_arm64.go @@ -61,7 +61,7 @@ var linuxARM64 = SyscallMap{ 33: makeSyscallInfo("mknodat", FD, Path, Mode, Hex), 34: makeSyscallInfo("mkdirat", FD, Path, Hex), 35: makeSyscallInfo("unlinkat", FD, Path, Hex), - 36: makeSyscallInfo("symlinkat", Path, Hex, Path), + 36: makeSyscallInfo("symlinkat", Path, FD, Path), 37: makeSyscallInfo("linkat", FD, Path, Hex, Path, Hex), 38: makeSyscallInfo("renameat", FD, Path, Hex, Path), 39: makeSyscallInfo("umount2", Path, Hex),