Fix CRIU

Kazuyoshi Kato · Kazuyoshi Kato · commit b520428b5a4f · 2021-03-16T16:46:45.000-07:00
- process.Init#io could be nil
- Make sure CreateTaskRequest#Options is not empty before unmarshaling

Signed-off-by: Kazuyoshi Kato &lt;katokazu@amazon.com&gt;
diff --git a/pkg/process/init.go b/pkg/process/init.go
@@ -193,11 +193,15 @@ func (p *Init) createCheckpointedState(r *CreateConfig, pidFile *pidFile) error
 			ParentPath: r.ParentCheckpoint,
 		},
 		PidFile:     pidFile.Path(),
-		IO:          p.io.IO(),
 		NoPivot:     p.NoPivotRoot,
 		Detach:      true,
 		NoSubreaper: true,
 	}
+
+	if p.io != nil {
+		opts.IO = p.io.IO()
+	}
+
 	p.initState = &createdCheckpointState{
 		p:    p,
 		opts: opts,
diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go
@@ -49,7 +49,7 @@ func NewContainer(ctx context.Context, platform stdio.Platform, r *task.CreateTa
 	}
 
 	var opts options.Options
-	if r.Options != nil {
+	if r.Options != nil && r.Options.GetTypeUrl() != "" {
 		v, err := typeurl.UnmarshalAny(r.Options)
 		if err != nil {
 			return nil, err

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func NewContainer(ctx context.Context, platform stdio.Platform, r *task.CreateTa`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`var opts options.Options`
`52`		`- if r.Options != nil {`
	`52`	`+ if r.Options != nil && r.Options.GetTypeUrl() != "" {`
`53`	`53`	`v, err := typeurl.UnmarshalAny(r.Options)`
`54`	`54`	`if err != nil {`
`55`	`55`	`return nil, err`