Skip to content

Conversation

@kolyshkin
Copy link
Contributor

This is a backport of #3465 to release-1.1, fixing clang issue seccomp/libseccomp-golang#90.

Signed-off-by: CrazyMax <[email protected]>
(cherry picked from commit 29a56b5)
Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin kolyshkin added kind/dependency backport/1.1-pr A backport PR to release-1.1 labels May 20, 2022
@kolyshkin kolyshkin added this to the 1.1.3 milestone May 20, 2022
kolyshkin added 2 commits May 20, 2022 13:25
This is the same as commit df2bc13
but for release-1.1 branch.

Signed-off-by: Kir Kolyshkin <[email protected]>
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)
(cherry picked from commit 68427f3)
Signed-off-by: Kir Kolyshkin <[email protected]>
Copy link
Member

@cyphar cyphar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cyphar cyphar merged commit 13e164d into opencontainers:release-1.1 May 23, 2022
@kolyshkin kolyshkin changed the title [1.1] bump seccomp [1.1] vendor: bump libseccomp-golang May 26, 2022
@kolyshkin kolyshkin mentioned this pull request Jun 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.1-pr A backport PR to release-1.1 kind/dependency

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants