Merge pull request #11333 from benhurdelhey:ben-hurdelhey_data/fix-mount-setup-initial-userns-fallback

gvisor-bot · gvisor-bot · commit b94ab7381565 · 2025-01-07T12:43:03.000-08:00
PiperOrigin-RevId: 713006567
diff --git a/runsc/cmd/gofer.go b/runsc/cmd/gofer.go
@@ -557,7 +557,7 @@ func (g *Gofer) setupMounts(conf *config.Config, mounts []specs.Mount, root, pro
 			// to open the mount, so let's try to open it in the
 			// parent user namespace.
 			var res container.OpenMountResult
-			if err := goferToHostRPC.Call("goferRPC.OpenMount", &m, &res); err != nil {
+			if err := goferToHostRPC.Call("goferToHostRPC.OpenMount", &m, &res); err != nil {
 				return fmt.Errorf("opening %s: %w", m.Source, err)
 			}
 			srcFile = res.Files[0]

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ func (g Gofer) setupMounts(conf config.Config, mounts []specs.Mount, root, pro`
`557`	`557`	`// to open the mount, so let's try to open it in the`
`558`	`558`	`// parent user namespace.`
`559`	`559`	`var res container.OpenMountResult`
`560`		`- if err := goferToHostRPC.Call("goferRPC.OpenMount", &m, &res); err != nil {`
	`560`	`+ if err := goferToHostRPC.Call("goferToHostRPC.OpenMount", &m, &res); err != nil {`
`561`	`561`	`return fmt.Errorf("opening %s: %w", m.Source, err)`
`562`	`562`	`}`
`563`	`563`	`srcFile = res.Files[0]`