Fix regression with mounts with non-absolute source path #1845
Conversation
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
PR opencontainers#1753 introduced a test on the mount flags but the binary operator was wrong, see opencontainers#1753 (comment) This was noticed when investigating opencontainers/runtime-tools#651 Symptoms: in the container, /proc/self/mountinfo displays some mounts as follow: 296 279 0:67 / /tmp rw,nosuid - tmpfs /home/dpark/go/src/github.com/opencontainers/runc/tmpfs rw,size=65536k,mode=755 Signed-off-by: Alban Crequy <[email protected]>
wking
approved these changes
Jul 18, 2018
Contributor
wking
left a comment
wking
left a comment
There was a problem hiding this comment.
Fix looks good; sorry about the bug!
Contributor
|
LGTM |
1 similar comment
Member
|
LGTM |
alban
added a commit
to kinvolk-archives/runtime-tools
that referenced
this pull request
Jul 31, 2018
The runtime-spec says that [mount source is optional]( https://github.com/opencontainers/runtime-spec/blob/v1.0.1/config.md#mounts). So let's relax condition of the mount source path check, so that it only checks for an empty mount source. Ditto for the type field. The 'mount' test now tries different mount options: bind and not bind, recursive or not, different mount propagation modes. runc passes the test after opencontainers/runc#1845 Based on work from: Dongsu Park <[email protected]> Signed-off-by: Alban Crequy <[email protected]>
alban
added a commit
to kinvolk-archives/runtime-tools
that referenced
this pull request
Jul 31, 2018
The runtime-spec says that [mount source is optional]( https://github.com/opencontainers/runtime-spec/blob/v1.0.1/config.md#mounts). So let's relax condition of the mount source path check, so that it only checks for an empty mount source. Ditto for the type field. The 'mount' test now tries different mount options: bind and not bind, recursive or not, different mount propagation modes. runc passes the test after opencontainers/runc#1845 Closes: opencontainers#651 Based on work from: Dongsu Park <[email protected]> Signed-off-by: Alban Crequy <[email protected]>
alban
added a commit
to kinvolk-archives/runtime-tools
that referenced
this pull request
Jul 31, 2018
The runtime-spec says that [mount source is optional]( https://github.com/opencontainers/runtime-spec/blob/v1.0.1/config.md#mounts). So let's relax condition of the mount source path check, so that it only checks for an empty mount source. Ditto for the type field. The 'mount' test now tries different mount options: bind and not bind, recursive or not, different mount propagation modes. runc passes the test after opencontainers/runc#1845 Closes: opencontainers#651 Based on work from: Dongsu Park <[email protected]> Signed-off-by: Alban Crequy <[email protected]>
alban
added a commit
to kinvolk-archives/runtime-tools
that referenced
this pull request
Jul 31, 2018
The runtime-spec says that [mount source is optional]( https://github.com/opencontainers/runtime-spec/blob/v1.0.1/config.md#mounts). So let's relax condition of the mount source path check, so that it only checks for an empty mount source. Ditto for the type field. The 'mount' test now tries different mount options: bind and not bind, recursive or not, different mount propagation modes. runc passes the test after opencontainers/runc#1845 Closes: opencontainers#651 Based on work from: Dongsu Park <[email protected]> Signed-off-by: Alban Crequy <[email protected]>
dongsupark
pushed a commit
to kinvolk-archives/runtime-tools
that referenced
this pull request
Aug 21, 2018
The runtime-spec says that [mount source is optional]( https://github.com/opencontainers/runtime-spec/blob/v1.0.1/config.md#mounts). So let's relax condition of the mount source path check, so that it only checks for an empty mount source. Ditto for the type field. The 'mount' test now tries different mount options: bind and not bind, recursive or not, different mount propagation modes. runc passes the test after opencontainers/runc#1845 Closes: opencontainers#651 Based on work from: Dongsu Park <[email protected]> Signed-off-by: Alban Crequy <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
PR #1753 introduced a test on the mount flags but the binary operator was wrong, see #1753 (comment)
This was noticed when investigating opencontainers/runtime-tools#651
Symptoms: in the container, /proc/self/mountinfo displays some mounts as follow:
Signed-off-by: Alban Crequy [email protected]
/cc @wking