diff --git a/libcontainer/integration/exec_test.go b/libcontainer/integration/exec_test.go index 77e1e436..ae7ecc41 100644 --- a/libcontainer/integration/exec_test.go +++ b/libcontainer/integration/exec_test.go @@ -845,15 +845,6 @@ func TestMountCgroupRO(t *testing.T) { mountInfo := buffers.Stdout.String() lines := strings.Split(mountInfo, "\n") for _, l := range lines { - if strings.HasPrefix(l, "tmpfs on /sys/fs/cgroup") { - if !strings.Contains(l, "ro,nosuid,nodev,noexec") { - t.Fatalf("Mode expected to contain 'ro,nosuid,nodev,noexec': %s", l) - } - if !strings.Contains(l, "mode=755") { - t.Fatalf("Mode expected to contain 'mode=755': %s", l) - } - continue - } if !strings.HasPrefix(l, "cgroup") { continue } @@ -889,15 +880,6 @@ func TestMountCgroupRW(t *testing.T) { mountInfo := buffers.Stdout.String() lines := strings.Split(mountInfo, "\n") for _, l := range lines { - if strings.HasPrefix(l, "tmpfs on /sys/fs/cgroup") { - if !strings.Contains(l, "ro,nosuid,nodev,noexec") { - t.Fatalf("Mode expected to contain 'ro,nosuid,nodev,noexec': %s", l) - } - if !strings.Contains(l, "mode=755") { - t.Fatalf("Mode expected to contain 'mode=755': %s", l) - } - continue - } if !strings.HasPrefix(l, "cgroup") { continue } diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go index fb388acc..a211d8de 100644 --- a/libcontainer/rootfs_linux.go +++ b/libcontainer/rootfs_linux.go @@ -196,7 +196,6 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string) error { Device: "tmpfs", Destination: m.Destination, Flags: defaultMountFlags, - Data: "mode=755", } if err := mountToRootfs(tmpfs, rootfs, mountLabel); err != nil { return err @@ -206,11 +205,6 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string) error { return err } } - // remount cgroup root as readonly - rootfsCgroup := filepath.Join(rootfs, m.Destination) - if err := syscall.Mount("", rootfsCgroup, "", defaultMountFlags|syscall.MS_REMOUNT|syscall.MS_RDONLY, ""); err != nil { - return err - } default: return fmt.Errorf("unknown mount device %q to %q", m.Device, m.Destination) }