SELinux: fix ENOTSUP errors not being detected when relabeling#40945
Merged
cpuguy83 merged 1 commit intomoby:masterfrom May 11, 2020
Merged
SELinux: fix ENOTSUP errors not being detected when relabeling#40945cpuguy83 merged 1 commit intomoby:masterfrom
cpuguy83 merged 1 commit intomoby:masterfrom
Conversation
Member
Author
|
ping @cpuguy83 @AkihiroSuda ptal /cc @cquon @adamparco |
Commit 12c7541 updated the opencontainers/selinux dependency to v1.3.1, which had a breaking change in the errors that were returned. Before v1.3.1, the "raw" `syscall.ENOTSUP` was returned if the underlying filesystem did not support xattrs, but later versions wrapped the error, which caused our detection to fail. This patch uses `errors.Is()` to check for the underlying error. This requires github.com/pkg/errors v0.9.1 or above (older versions could use `errors.Cause()`, but are not compatible with "native" wrapping of errors in Go 1.13 and up, and could potentially cause these errors to not being detected again. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
725ddf3 to
49f8a42
Compare
thaJeztah
commented
May 10, 2020
| } | ||
| }() | ||
| if err := label.Relabel(path, container.MountLabel, true); err != nil && err != unix.ENOTSUP { | ||
| if err := label.Relabel(path, container.MountLabel, true); err != nil && !errors.Is(err, syscall.ENOTSUP) { |
Member
Author
There was a problem hiding this comment.
Note; I picked syscall here, to be consistent with ignoreUnsupportedXAttrs. Both unix. and syscall. work (same error type under the hood)
AkihiroSuda
approved these changes
May 10, 2020
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.
Commit 12c7541 (#40546) updated the opencontainers/selinux dependency to v1.3.1, which had a breaking change in the errors that were returned.
Before v1.3.1, the "raw"
syscall.ENOTSUPwas returned if the underlying filesystem did not support xattrs, but later versions wrapped the error, which caused our detection to fail.This patch uses
errors.Is()to check for the underlying error. This requires github.com/pkg/errors v0.9.1 or above (older versions could useerrors.Cause(), but are not compatible with "native" wrapping of errors in Go 1.13 and up, and could potentially cause these errors to not being detected again.Addresses #40944 for master
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)