-
Notifications
You must be signed in to change notification settings - Fork 2.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
vendor: bump seccomp/libseccomp-golang to f33da4d #3465
Conversation
Looks like there's some uses of
|
4022d05
to
d7f482d
Compare
@@ -113,8 +113,8 @@ func InitSeccomp(config *configs.Seccomp) (int, error) { | |||
// Convert Libcontainer Action to Libseccomp ScmpAction | |||
func getAction(act configs.Action, errnoRet *uint) (libseccomp.ScmpAction, error) { | |||
switch act { | |||
case configs.Kill: | |||
return libseccomp.ActKill, nil | |||
case configs.Kill, configs.KillThread: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wondering if one of configs.Kill
also should be deprecated on this side 🤔 (not for this PR, just thinking out loud?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have the same problem in libcontainer/config -- Kill and KillThread are two distinct constants. Guess it makes sense to deprecate the former.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup; that was my thought as well
I'm ok doing that separately, but something we should probably do
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh well, it's a bit bigger than I thought; see #3466
@crazy-max feel free to cherry-pick that commit to here.
I also think we should really deprecate ACT_KILL, but it should be done in the runtime-spec repo first.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@crazy-max can you swap the order of the commits (assuming both |
Signed-off-by: CrazyMax <[email protected]>
Signed-off-by: CrazyMax <[email protected]>
d7f482d
to
df2bc13
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@kolyshkin PTAL
OCI spec added SCMP_ACT_KILL_THREAD and SCMP_ACT_KILL_PROCESS almost two years ago ([1], [2]), but runc support was half-finished [3]. Add these actions, and modify the test case to check them. In addition, "runc features" now lists the new actions. [1] opencontainers/runtime-spec#1044 [2] opencontainers/runtime-spec#1064 [3] https://github.com/opencontainers/runc/pulls/3204 Fixes: 4a4d4f1 Signed-off-by: Kir Kolyshkin <[email protected]> (cherry picked from commit e74fdeb)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@thaJeztah I see your LGTM, but you probably forgot to actually "Accept" the PR |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whoops! probably picked "comment" instead of "approve" 😂
LGTM (for real this time)
@thaJeztah @kolyshkin is there a milestone that includes this PR to fix the clang issue? cc @tonistiigi |
fixes clang issue seccomp/libseccomp-golang#90.
@thaJeztah there are other changes while vendoring it seccomp/libseccomp-golang@3879420...f33da4d. not sure about the impact of them on runc.
Signed-off-by: CrazyMax [email protected]