Skip to content

seccomp: whitelist statx syscall#3111

Merged
crosbymichael merged 1 commit intocontainerd:masterfrom
thaJeztah:whitelist_statx
Mar 20, 2019
Merged

seccomp: whitelist statx syscall#3111
crosbymichael merged 1 commit intocontainerd:masterfrom
thaJeztah:whitelist_statx

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

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

@thaJeztah
Copy link
Copy Markdown
Member Author

I'll open backports for this for the release-branches

ping @tonistiigi (for BuildKit), @NobodyOnSE (thanks for the original PR), @dschmidt (thanks for reporting), @justincormack (🤗 )

@thaJeztah thaJeztah changed the title Whitelist statx syscall seccomp: whitelist statx syscall Mar 20, 2019
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]>
@thaJeztah
Copy link
Copy Markdown
Member Author

Oh, actually; I just realised containerd itself does not apply the seccomp profile, but (in this case) buildkit vendors the package and applies the profile, so it needs to be vendored in buildkit / moby after it's merged; perhaps the backports are not needed (although they don't really harm)

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

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3111 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3111   +/-   ##
=======================================
  Coverage   43.59%   43.59%           
=======================================
  Files         104      104           
  Lines       11135    11135           
=======================================
  Hits         4854     4854           
  Misses       5545     5545           
  Partials      736      736
Flag Coverage Δ
#linux 47.57% <ø> (ø) ⬆️
#windows 40.47% <ø> (ø) ⬆️

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 9ab4c8c...8f8fd3c. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit 9bd6b09 into containerd:master Mar 20, 2019
@thaJeztah thaJeztah deleted the whitelist_statx branch March 20, 2019 16:08
@tonistiigi
Copy link
Copy Markdown
Member

We really should standardize on the upstream for the default seccomp profile so containerd and docker (and anyone else) can use the same. Does anyone have suggestions on how this could look like? Docker has an extra requirement that profiles must be loadable/exportable to json so can't use this directly atm. For example, another change coming in 19.03 is the special handling of ptrace that is not in containerd atm.

@thaJeztah
Copy link
Copy Markdown
Member Author

perhaps a containerd/seccomp repository that both can vendor?

@crosbymichael
Copy link
Copy Markdown
Member

Keep it in the containerd repo

@crosbymichael
Copy link
Copy Markdown
Member

I don't want another repo just cuz, more deps and vendors just make it complicated

@justincormack
Copy link
Copy Markdown
Contributor

don't mind where it is but maintaining it as part of containerd makes sense.

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.

6 participants