From b63e61828d0652ad1769db342c17a3529d2d24ed Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@google.com>
Date: Tue, 25 May 2021 18:53:36 -0700
Subject: Initialize Kernel.Timekeeper before network NS

PiperOrigin-RevId: 375843579
---
 pkg/sentry/fsimpl/testutil/kernel.go |  2 +-
 pkg/sentry/kernel/kernel.go          | 22 ++++++++++++----------
 runsc/boot/loader.go                 |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkg/sentry/fsimpl/testutil/kernel.go b/pkg/sentry/fsimpl/testutil/kernel.go
index 8d47b5c40..438840ae2 100644
--- a/pkg/sentry/fsimpl/testutil/kernel.go
+++ b/pkg/sentry/fsimpl/testutil/kernel.go
@@ -88,6 +88,7 @@ func Boot() (*kernel.Kernel, error) {
 		return nil, fmt.Errorf("creating timekeeper: %v", err)
 	}
 	tk.SetClocks(time.NewCalibratedClocks())
+	k.SetTimekeeper(tk)
 
 	creds := auth.NewRootCredentials(auth.NewRootUserNamespace())
 
@@ -96,7 +97,6 @@ func Boot() (*kernel.Kernel, error) {
 	if err = k.Init(kernel.InitKernelArgs{
 		ApplicationCores:            uint(runtime.GOMAXPROCS(-1)),
 		FeatureSet:                  cpuid.HostFeatureSet(),
-		Timekeeper:                  tk,
 		RootUserNamespace:           creds.UserNamespace,
 		Vdso:                        vdso,
 		RootUTSNamespace:            kernel.NewUTSNamespace("hostname", "domain", creds.UserNamespace),
diff --git a/pkg/sentry/kernel/kernel.go b/pkg/sentry/kernel/kernel.go
index 345e9131f..febe7fe50 100644
--- a/pkg/sentry/kernel/kernel.go
+++ b/pkg/sentry/kernel/kernel.go
@@ -306,9 +306,6 @@ type InitKernelArgs struct {
 	// FeatureSet is the emulated CPU feature set.
 	FeatureSet *cpuid.FeatureSet
 
-	// Timekeeper manages time for all tasks in the system.
-	Timekeeper *Timekeeper
-
 	// RootUserNamespace is the root user namespace.
 	RootUserNamespace *auth.UserNamespace
 
@@ -348,18 +345,24 @@ type InitKernelArgs struct {
 	PIDNamespace *PIDNamespace
 }
 
+// SetTimekeeper sets Kernel.timekeeper. SetTimekeeper must be called before
+// Init.
+func (k *Kernel) SetTimekeeper(tk *Timekeeper) {
+	k.timekeeper = tk
+}
+
 // Init initialize the Kernel with no tasks.
 //
 // Callers must manually set Kernel.Platform and call Kernel.SetMemoryFile
-// before calling Init.
+// and Kernel.SetTimekeeper before calling Init.
 func (k *Kernel) Init(args InitKernelArgs) error {
 	if args.FeatureSet == nil {
 		return fmt.Errorf("args.FeatureSet is nil")
 	}
-	if args.Timekeeper == nil {
-		return fmt.Errorf("args.Timekeeper is nil")
+	if k.timekeeper == nil {
+		return fmt.Errorf("timekeeper is nil")
 	}
-	if args.Timekeeper.clocks == nil {
+	if k.timekeeper.clocks == nil {
 		return fmt.Errorf("must call Timekeeper.SetClocks() before Kernel.Init()")
 	}
 	if args.RootUserNamespace == nil {
@@ -370,7 +373,6 @@ func (k *Kernel) Init(args InitKernelArgs) error {
 	}
 
 	k.featureSet = args.FeatureSet
-	k.timekeeper = args.Timekeeper
 	k.tasks = newTaskSet(args.PIDNamespace)
 	k.rootUserNamespace = args.RootUserNamespace
 	k.rootUTSNamespace = args.RootUTSNamespace
@@ -395,8 +397,8 @@ func (k *Kernel) Init(args InitKernelArgs) error {
 	}
 	k.extraAuxv = args.ExtraAuxv
 	k.vdso = args.Vdso
-	k.realtimeClock = &timekeeperClock{tk: args.Timekeeper, c: sentrytime.Realtime}
-	k.monotonicClock = &timekeeperClock{tk: args.Timekeeper, c: sentrytime.Monotonic}
+	k.realtimeClock = &timekeeperClock{tk: k.timekeeper, c: sentrytime.Realtime}
+	k.monotonicClock = &timekeeperClock{tk: k.timekeeper, c: sentrytime.Monotonic}
 	k.futexes = futex.NewManager()
 	k.netlinkPorts = port.New()
 	k.ptraceExceptions = make(map[*Task]*Task)
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go
index 0c3bb1800..efa014b25 100644
--- a/runsc/boot/loader.go
+++ b/runsc/boot/loader.go
@@ -287,6 +287,7 @@ func New(args Args) (*Loader, error) {
 		return nil, fmt.Errorf("creating timekeeper: %w", err)
 	}
 	tk.SetClocks(time.NewCalibratedClocks())
+	k.SetTimekeeper(tk)
 
 	if err := enableStrace(args.Conf); err != nil {
 		return nil, fmt.Errorf("enabling strace: %w", err)
@@ -335,7 +336,6 @@ func New(args Args) (*Loader, error) {
 	// to createVFS in order to mount (among other things) procfs.
 	if err = k.Init(kernel.InitKernelArgs{
 		FeatureSet:                  cpuid.HostFeatureSet(),
-		Timekeeper:                  tk,
 		RootUserNamespace:           creds.UserNamespace,
 		RootNetworkNamespace:        netns,
 		ApplicationCores:            uint(args.NumCPU),
-- 
cgit v1.2.3