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

overlayutils: Add fastpath for userxattr check #7611

Merged
merged 1 commit into from
Nov 1, 2022

Conversation

dcantah
Copy link
Member

@dcantah dcantah commented Nov 1, 2022

Cleaning up TODO's. If we're on >= 5.11 we need userxattr so check the kernel version to skip the manual check via mounting. It feels odd to use contrib/seccomp here but the alternative is pulling that kernel parsing code out into the main pkgs. Another is using the moby parser but that's in moby/moby which is also a dep we don't want here..

Cleaning up TODO's. If we're on >= 5.11 we need userxattr so check
the kernel version to skip the manual check via mounting. It feels
odd to use contrib/seccomp here but the alternative is pulling that
kernel parsing code out into the main pkgs. Another is using the moby
parser but that's in moby/moby which is also a dep we don't want here..

Signed-off-by: Danny Canter <[email protected]>
@dcantah dcantah marked this pull request as draft November 1, 2022 00:25
@dcantah dcantah closed this Nov 1, 2022
@dcantah dcantah reopened this Nov 1, 2022
@AdamKorcz
Copy link
Contributor

The CI Fuzz issue should have been fixed.

@dcantah dcantah closed this Nov 1, 2022
@dcantah dcantah reopened this Nov 1, 2022
@dcantah dcantah marked this pull request as ready for review November 1, 2022 16:11
@AkihiroSuda AkihiroSuda added the cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch label Nov 1, 2022
Copy link
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

@estesp estesp merged commit 740c933 into containerd:main Nov 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants