Revert "rootfs: handle nested procfs mounts for MS_MOVE" + add a test #2654
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
This reverts commit b8bf572. Revert #2647 Reopen #2339 Signed-off-by: Akihiro Suda <[email protected]>
AkihiroSuda
force-pushed
the
revert-2647-procfs-masking-nested
branch
from
b626821 to
2aa00eb
Compare
|
This is actually a bug in |
cyphar
reviewed
Oct 20, 2020
| mountinfos, err := mountinfo.GetMounts(func(info *mountinfo.Info) (skip, stop bool) { | ||
| // Collect every sysfs and procfs filesystem, except for those which | ||
| // are non-full mounts or are inside the rootfs of the container. | ||
| if info.Root != "/" || |
There was a problem hiding this comment.
It's overkill to revert it -- a simpler patch is to just remove this info.Root != "/" clause which won't cause us to revert the fix (the ENOENT check later in the patch is sufficient to fix that bug).
There was a problem hiding this comment.
Let's revert it first and then revendor moby/sys#50 when it is merged
There was a problem hiding this comment.
I agree with @cyphar here -- for the reason of having a slightly less dramatic git history.
For preventing regression like #2647 Signed-off-by: Akihiro Suda <[email protected]>
AkihiroSuda
changed the title
|
Added a new commit: |
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.
Reverts #2647 due to a security issue
Reopens #2639