Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[1.1] libcontainer: skip chown of /dev/null caused by fd redirection #3731

Merged
merged 2 commits into from
Feb 9, 2023
Merged

[1.1] libcontainer: skip chown of /dev/null caused by fd redirection #3731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa722c1
libcontainer: skip chown of /dev/null caused by fd redirection
Dzejrou Jan 20, 2023
9233b3d
tests/int: test for /dev/null owner regression
kolyshkin Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions libcontainer/init_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,9 @@ func fixStdioPermissions(u *user.ExecUser) error {
return &os.PathError{Op: "fstat", Path: file.Name(), Err: err}
}

// Skip chown if uid is already the one we want.
if int(s.Uid) == u.Uid {
// Skip chown if uid is already the one we want or any of the STDIO descriptors
// were redirected to /dev/null.
if int(s.Uid) == u.Uid || s.Rdev == null.Rdev {
continue
}

Expand Down
17 changes: 16 additions & 1 deletion tests/integration/exec.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,25 @@ function teardown() {

runc exec --user 1000:1000 test_busybox id
[ "$status" -eq 0 ]

[[ "${output}" == "uid=1000 gid=1000"* ]]
}

# https://github.com/opencontainers/runc/issues/3674.
@test "runc exec --user vs /dev/null ownership" {
requires root

runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox
[ "$status" -eq 0 ]

ls -l /dev/null
__runc exec -d --user 1000:1000 test_busybox id </dev/null
ls -l /dev/null
UG=$(stat -c %u:%g /dev/null)

# Host's /dev/null must be owned by root.
[ "$UG" = "0:0" ]
}

@test "runc exec --additional-gids" {
requires root

Expand Down