zishuo/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-10-07 08:21:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix mount error when chmod RO tmpfs

Browse Source 
Signed-off-by: Eduardo Vega <edvegavalerio@gmail.com>
This commit is contained in:
Eduardo Vega
2020-08-28 16:06:23 -06:00
parent 0a9af3949f
commit fb4c27c4b7
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libcontainer/rootfs_linux.go
View File

@@ -383,6 +383,12 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string, enableCgroupns b
return err return err
} }
} }
// Initially mounted rw in mountPropagate, remount to ro if flag set.
if m.Flags&unix.MS_RDONLY != 0 {
if err := remount(m, rootfs); err != nil {
return err
}
}
return nil return nil
case "bind": case "bind":
if err := prepareBindMount(m, rootfs); err != nil { if err := prepareBindMount(m, rootfs); err != nil {
@@ -957,6 +963,12 @@ func mountPropagate(m *configs.Mount, rootfs string, mountLabel string) error {
flags &= ^unix.MS_RDONLY flags &= ^unix.MS_RDONLY
} }
// Mount it rw to allow chmod operation. A remount will be performed
// later to make it ro if set.
if m.Device == "tmpfs" {
flags &= ^unix.MS_RDONLY
}
copyUp := m.Extensions&configs.EXT_COPYUP == configs.EXT_COPYUP copyUp := m.Extensions&configs.EXT_COPYUP == configs.EXT_COPYUP
if !(copyUp || strings.HasPrefix(dest, rootfs)) { if !(copyUp || strings.HasPrefix(dest, rootfs)) {
dest = filepath.Join(rootfs, dest) dest = filepath.Join(rootfs, dest)

9
tests/integration/mounts.bats
View File

@@ -20,3 +20,12 @@ function teardown() {
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ "${lines[0]}" == *'/tmp/bind/config.json'* ]] [[ "${lines[0]}" == *'/tmp/bind/config.json'* ]]
} }
@test "runc run [ro tmpfs mount]" {
update_config ' .mounts += [{"source": "tmpfs", "destination": "/mnt", "type": "tmpfs", "options": ["ro", "nodev", "nosuid", "mode=755"]}]
| .process.args |= ["grep", "^tmpfs /mnt", "/proc/mounts"]'
runc run test_ro_tmpfs_mount
[ "$status" -eq 0 ]
[[ "${lines[0]}" == *'ro,'* ]]
}