Skip to content

[release/1.1 backport] seccomp: whitelist statx syscall#3112

Merged
crosbymichael merged 1 commit intocontainerd:release/1.1from
thaJeztah:1.1_backport_whitelist_statx
Mar 20, 2019
Merged

[release/1.1 backport] seccomp: whitelist statx syscall#3112
crosbymichael merged 1 commit intocontainerd:release/1.1from
thaJeztah:1.1_backport_whitelist_statx

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

backport of #3111 for the release/1.1 branch

This whitelists the statx syscall; libseccomp-2.3.3 or up
is needed for this, older seccomp versions will ignore this.

Equivalent of moby/moby#36417
addresses docker/for-linux#616

This whitelists the statx syscall; libseccomp-2.3.3 or up
is needed for this, older seccomp versions will ignore this.

Equivalent of moby/moby#36417

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 8f8fd3c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

I just realised containerd itself does not apply the seccomp profile, but higher level tools can use the profile from contrib, so it's not strictly needed for backporting: feel free to close if that's prefered

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3112 into release/1.1 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.1    #3112   +/-   ##
============================================
  Coverage        49.07%   49.07%           
============================================
  Files               85       85           
  Lines             7598     7598           
============================================
  Hits              3729     3729           
  Misses            3194     3194           
  Partials           675      675
Flag Coverage Δ
#linux 49.07% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9a0a5fd...03d129b. Read the comment docs.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit cdc2fe6 into containerd:release/1.1 Mar 20, 2019
@thaJeztah thaJeztah deleted the 1.1_backport_whitelist_statx branch March 20, 2019 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants