contain: retain proc fd directory for descriptor sealing - #294
Open
soul-sol wants to merge 1 commit into
Open
Conversation
Signed-off-by: solim <7576268+soul-sol@users.noreply.github.com>
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
This file contains hidden or 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
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.
Problem
The final descriptor-sealing pass first tries
close_range(..., CLOSE_RANGE_CLOEXEC), then enumerates/proc/self/fd,then falls back to scanning descriptor numbers 0 through 1023.
When
close_range()is unavailable or denied and mount/chroot setup hides/proc, inherited descriptors above 1023 are not marked close-on-exec and cansurvive into the jailed target.
Change
Open
/proc/self/fdbefore mount namespace setup and retain that directorystream until the final descriptor-sealing pass. The pass can then enumerate the
complete final descriptor set even when the configured jail does not expose
/proc.The existing order is preserved:
close_range()when available;The retained stream is closed by its owner on every
containProc()return path.Verification
close_range()forced to returnEPERM,--disable_proc, andan inherited descriptor 1500: the target can observe descriptor 1500.
target execution.
--pass_fd 1500remains preserved.--pass_fdnumber reused by the retained proc directory is releasedby the stream owner before target execution.
--execute_fd, andlisten-mode paths were exercised.
-Werror.This is a hardening change for the process-isolation boundary and does not
change the behavior of explicitly passed descriptors.