[0.38] seccomp: add support for defaultErrnoRet#689
Merged
openshift-merge-robot merged 4 commits intocontainers:v0.38from Jul 24, 2021
Merged
[0.38] seccomp: add support for defaultErrnoRet#689openshift-merge-robot merged 4 commits intocontainers:v0.38from
openshift-merge-robot merged 4 commits intocontainers:v0.38from
Conversation
Add support to specify the default errno return value. The OCI runtime specs already have support for it, and both crun (>= 0.19) and runc (>= 1.0-rc95) have support for it. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> (cherry picked from commit adee333) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Contributor
Author
|
@vrothberg @rhatdan this aids in fixing containers/podman#11029 and the likes with runc runtime. Could you please cut a release? |
This prevents "defaultErrnoRet": null, from appearing in seccomp.json. This member is similar to ErrnoRet in type Syscall, and should also be marked with omitempty. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
cac2ee5 to
f09951c
Compare
Contributor
Author
|
Added a commit to fix validation. Forward-ported to main branch in #690 |
Member
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kolyshkin, rhatdan The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Contributor
Author
Member
|
Done |
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
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 is a partial backport of #573 to v0.38 branch.
Needed to fix containers/podman#11029 and the likes.
Original description follows.
Add support to specify the default errno return value.
The OCI runtime specs already have support for it, and both crun (>=
0.19) and runc (>= 1.0-rc95) have support for it.
Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com
(cherry picked from commit adee333)
Signed-off-by: Kir Kolyshkin kolyshkin@gmail.com