Merge pull request #2035 from cyphar/bindmount-types

specconv: always set "type: bind" in case of MS_BIND
opencontainers · May 7, 2019 · 2484581 · 2484581
2 parents a0ecf74 + 8296826
commit 2484581
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
@@ -277,9 +277,10 @@ func createLibcontainerMount(cwd string, m specs.Mount) *configs.Mount {
 	source := m.Source
 	device := m.Type
 	if flags&unix.MS_BIND != 0 {
-		if device == "" {
-			device = "bind"
-		}
+		// Any "type" the user specified is meaningless (and ignored) for
+		// bind-mounts -- so we set it to "bind" because rootfs_linux.go
+		// (incorrectly) relies on this for some checks.
+		device = "bind"
 		if !filepath.IsAbs(source) {
 			source = filepath.Join(cwd, m.Source)
 		}