[1.1] Fix working with read-only /dev #3355
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use os/file Chown method instead of bare unix.Fchown as it already have access to underlying fd, and produces nice-looking errors. This allows us to remove our error wrapping and some linter annotations. We still use unix.Fstat since os.Stat access to os-specific fields like uid/gid is not very straightforward. The only change here is to use file name (rather than fd) in the error text. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit b7fdb68) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Since we already called fstat, we know the current file uid. In case it is the same as the one we want it to be, there's no point in trying chown. Remove the specific /dev/null check, as the above also covers it (comparing /dev/null uid with itself is true). This also fixes runc exec with read-only /dev for root user. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 18c4760) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
In case of a read-only /dev, it's better to move on and let whatever is run in a container to handle any possible errors. This solves runc exec for a user with read-only /dev. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 146c8c0) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
|
OK, it seems we have wrong branch protection rules for release-1.1 (that have Will fix. |
|
I have created branch protection rules for release-1.1, and also enabled the following (as an experiment):
Perhaps it makes sense to enable it for main as well, since I've seen a few times that independent merges result in broken code. |
AkihiroSuda
approved these changes
Jan 28, 2022
mrunalp
approved these changes
Jan 28, 2022
Merged
Dzejrou
added a commit
to Dzejrou/runc
that referenced
this pull request
Jan 20, 2023
In opencontainers#3355 the check whether the STDIO file descriptors point to /dev/null was removed which can cause /dev/null to change ownership e.g. when using docker exec on a running container: $ ls -l /dev/null crw-rw-rw- 1 root root 1, 3 Aug 1 14:12 /dev/null $ docker exec -u test 0ad6d3064e9d ls $ ls -l /dev/null crw-rw-rw- 1 test root 1, 3 Aug 1 14:12 /dev/null
cyphar
pushed a commit
to Dzejrou/runc
that referenced
this pull request
Feb 2, 2023
In opencontainers#3355 the check whether the STDIO file descriptors point to /dev/null was removed which can cause /dev/null to change ownership e.g. when using docker exec on a running container: $ ls -l /dev/null crw-rw-rw- 1 root root 1, 3 Aug 1 14:12 /dev/null $ docker exec -u test 0ad6d3064e9d ls $ ls -l /dev/null crw-rw-rw- 1 test root 1, 3 Aug 1 14:12 /dev/null
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a backport of #3345 to 1.1 branch, needed for newer Podman (see containers/podman#12954).
See original PR for details.