generate: fix cap add/drop and initialize in privileged mode#464
Merged
mrunalp merged 1 commit intoopencontainers:masterfrom Sep 7, 2017
Merged
generate: fix cap add/drop and initialize in privileged mode#464mrunalp merged 1 commit intoopencontainers:masterfrom
mrunalp merged 1 commit intoopencontainers:masterfrom
Conversation
Contributor
|
LGTM |
Contributor
|
LGTM |
Contributor
|
@Mashimiao PTAL |
Mashimiao
reviewed
Sep 7, 2017
| g.spec.Process.Capabilities.Effective = append(g.spec.Process.Capabilities.Effective, finalCapList...) | ||
| g.spec.Process.Capabilities.Inheritable = append(g.spec.Process.Capabilities.Inheritable, finalCapList...) | ||
| g.spec.Process.Capabilities.Permitted = append(g.spec.Process.Capabilities.Permitted, finalCapList...) | ||
| g.spec.Process.Capabilities.Ambient = append(g.spec.Process.Capabilities.Ambient, finalCapList...) |
There was a problem hiding this comment.
Before appending finalCapList, should we clear Capabilities first?
I'm afraid if we use --process-cap-add and --privileged together, this may cause duplicate cap items problem
Member
Author
There was a problem hiding this comment.
Fixed to reset the slice first.
Mashimiao
reviewed
Sep 7, 2017
| g.spec.Process.Capabilities.Inheritable = finalCapList | ||
| g.spec.Process.Capabilities.Permitted = finalCapList | ||
| g.spec.Process.Capabilities.Ambient = finalCapList | ||
| g.spec.Process.Capabilities.Bounding = []string{} |
There was a problem hiding this comment.
Ah, how about taking advantage of ClearProcessCapabilities()?
This patch fixes two things: - do not share slice between caps sets or otherwise you get lots of troubles when playing with add/drop and slices... - fix cap add by effectively adding caps to all sets... Signed-off-by: Antonio Murdaca <runcom@redhat.com>
|
LGTM. Thanks! |
Contributor
|
LGTM |
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
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.
This patch fixes two things:
troubles when playing with add/drop and slices... (slices are references...)
@mrunalp PTAL asap
Signed-off-by: Antonio Murdaca runcom@redhat.com