Revert "libcontainer: seccomp: pass around *os.File for notifyfd"#4337
Merged
Conversation
This reverts commit 20b95f2. > Conflicts: > libcontainer/init_linux.go Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
rata
reviewed
Jul 3, 2024
For issue 4328 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
kolyshkin
reviewed
Jul 3, 2024
kolyshkin
approved these changes
Jul 8, 2024
cyphar
approved these changes
Jul 9, 2024
Member
cyphar
left a comment
cyphar
left a comment
There was a problem hiding this comment.
LGTM. Yeah it's unfortunate that we can't use *os.File -- I mainly included this change to eliminate the chance of us leaking the descriptor, but I guess in the seccompFd case this isn't such a huge deal...
Closed
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.
Fix #4328
Commit 1: Revert "libcontainer: seccomp: pass around *os.File for notifyfd"
This reverts commit 20b95f2.
Commit 2: seccomp-notify.bats: add fcntl to the important syscall list
For:
SCMP_ACT_NOTIFYrule forfcntlcauses runc to hang, before connecting to the seccomp listener agent #4328