summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/task_log.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-09-16 18:58:20 +0000
committergVisor bot <gvisor-bot@google.com>2021-09-16 18:58:20 +0000
commite73986dd376c2c71d81ab8ccabdea3aecac5e9d5 (patch)
tree73c039e763ec11687a730ade4a9beeaf1d699d41 /pkg/sentry/kernel/task_log.go
parent812a722c54a8c359f77d1bdfea9f63b810e5a5a8 (diff)
parent282a4dd52b337dccfb578e9d32dd1005c864dd8d (diff)
Merge release-20210906.0-34-g282a4dd52 (automated)
Diffstat (limited to 'pkg/sentry/kernel/task_log.go')
-rw-r--r--pkg/sentry/kernel/task_log.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/task_log.go b/pkg/sentry/kernel/task_log.go
index 8de08151a..c5b099559 100644
--- a/pkg/sentry/kernel/task_log.go
+++ b/pkg/sentry/kernel/task_log.go
@@ -249,5 +249,9 @@ func (t *Task) traceExecEvent(image *TaskImage) {
return
}
defer file.DecRef(t)
- trace.Logf(t.traceContext, traceCategory, "exec: %s", file.PathnameWithDeleted(t))
+
+ // traceExecEvent function may be called before the task goroutine
+ // starts, so we must use the async context.
+ name := file.PathnameWithDeleted(t.AsyncContext())
+ trace.Logf(t.traceContext, traceCategory, "exec: %s", name)
}