add a test case about missing stricky bit

Signed-off-by: lifubang <lifubang@acmcoder.com>
opencontainers · Aug 2, 2023 · ddf97e0 · ddf97e0
1 parent 6a7f206
commit ddf97e0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/libcontainer/mount_linux.go b/libcontainer/mount_linux.go
@@ -106,8 +106,8 @@ func unmount(target string, flags int) error {
 	return nil
 }
 
-// SyscallMode returns the syscall-specific mode bits from Go's portable mode bits.
-func SyscallMode(i fs.FileMode) (o uint32) {
+// syscallMode returns the syscall-specific mode bits from Go's portable mode bits.
+func syscallMode(i fs.FileMode) (o uint32) {
 	o |= uint32(i.Perm())
 	if i&fs.ModeSetuid != 0 {
 		o |= syscall.S_ISUID

diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go
@@ -462,7 +462,7 @@ func mountToRootfs(c *mountConfig, m mountEntry) error {
 				return err
 			}
 		} else {
-			dt := fmt.Sprintf("mode=%04o", SyscallMode(stat.Mode()))
+			dt := fmt.Sprintf("mode=%04o", syscallMode(stat.Mode()))
 			if m.Data != "" {
 				dt = dt + "," + m.Data
 			}

diff --git a/tests/integration/run.bats b/tests/integration/run.bats
@@ -77,6 +77,19 @@ function teardown() {
 	[[ "${lines[0]}" == *'mydomainname'* ]]
 }
 
+@test "runc run with tmpfs" {
+	requires root
+
+	mode=$(stat -c %A /tmp)
+	# shellcheck disable=SC2016
+	update_config '.process.args = ["sh", "-c", "stat -c %A /tmp"]'
+	update_config '.mounts += [{"destination": "/tmp", "type": "tmpfs", "source": "tmpfs", "options":["noexec","nosuid","nodev","rprivate"]}]'
+
+	runc run test_tmpfs
+	[ "$status" -eq 0 ]
+	[ "$output" = "$mode" ]
+}
+
 @test "runc run with tmpfs perms" {
 	# shellcheck disable=SC2016
 	update_config '.process.args = ["sh", "-c", "stat -c %a /tmp/test"]'