Pass the container name to SpecEnviron instead of container ID.

manninglucas · gvisor-bot · commit e888aa733876 · 2025-06-03T11:11:43.000-07:00
PiperOrigin-RevId: 766740302
diff --git a/pkg/sentry/control/state.go b/pkg/sentry/control/state.go
@@ -258,7 +258,8 @@ func SaveRestoreExec(k *kernel.Kernel, mode SaveRestoreExecMode) error {
 	// env vars without relying on the Saver().
 	var envv []string
 	if k.Saver() != nil {
-		envv = k.Saver().SpecEnviron(contID)
+		contName := k.ContainerName(contID)
+		envv = k.Saver().SpecEnviron(contName)
 	}
 
 	proc := Proc{

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,8 @@ func SaveRestoreExec(k *kernel.Kernel, mode SaveRestoreExecMode) error {`
`258`	`258`	`// env vars without relying on the Saver().`
`259`	`259`	`var envv []string`
`260`	`260`	`if k.Saver() != nil {`
`261`		`- envv = k.Saver().SpecEnviron(contID)`
	`261`	`+ contName := k.ContainerName(contID)`
	`262`	`+ envv = k.Saver().SpecEnviron(contName)`
`262`	`263`	`}`
`263`	`264`
`264`	`265`	`proc := Proc{`