Skip to content
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

[0.38] seccomp: add support for defaultErrnoRet #689

Merged

Conversation

kolyshkin
Copy link
Contributor

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

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 <[email protected]>
(cherry picked from commit adee333)
Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin kolyshkin changed the title seccomp: add support for defaultErrnoRet [0.38] seccomp: add support for defaultErrnoRet Jul 23, 2021
@kolyshkin
Copy link
Contributor Author

kolyshkin commented Jul 23, 2021

@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 <[email protected]>
* pkg/seccomp: add support for default errno return value.

Signed-off-by: Kir Kolyshkin <[email protected]>
Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin
Copy link
Contributor Author

Added a commit to fix validation. Forward-ported to main branch in #690

@rhatdan
Copy link
Member

rhatdan commented Jul 24, 2021

/approve
/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 24, 2021

[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

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 6d46e2e into containers:v0.38 Jul 24, 2021
@kolyshkin
Copy link
Contributor Author

@rhatdan can you please tag a release? 13c470a

@rhatdan
Copy link
Member

rhatdan commented Jul 25, 2021

Done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants