From 71f3dccbb3d47cbf572afe0737a29c8d87fde9c9 Mon Sep 17 00:00:00 2001 From: Fabricio Voznika Date: Tue, 30 Mar 2021 11:35:03 -0700 Subject: Fix panic when overriding /dev files with VFS2 VFS1 skips over mounts that overrides files in /dev because the list of files is hardcoded. This is not needed for VFS2 and a recent change lifted this restriction. However, parts of the code were still skipping /dev mounts even in VFS2, causing the loader to panic when it ran short of FDs to connect to the gofer. PiperOrigin-RevId: 365858436 --- runsc/container/container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runsc/container/container.go') diff --git a/runsc/container/container.go b/runsc/container/container.go index f9d83c118..e72ada311 100644 --- a/runsc/container/container.go +++ b/runsc/container/container.go @@ -886,7 +886,7 @@ func (c *Container) createGoferProcess(spec *specs.Spec, conf *config.Config, bu // Add root mount and then add any other additional mounts. mountCount := 1 for _, m := range spec.Mounts { - if specutils.Is9PMount(m) { + if specutils.Is9PMount(m, conf.VFS2) { mountCount++ } } -- cgit v1.2.3