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

[1.2] drop runc-dmz solution according to overlay solution #4487

Closed
wants to merge 7 commits into from

Conversation

lifubang
Copy link
Member

Backport #4482

Because we have the overlay solution, we can drop runc-dmz binary solution since it has too many limitations.

The original post is here: #4450 (comment)

Because of there are many commits about runc-dmz binary solution, so doing git revert action is very hard, let's drop these code line by line.

cyphar and others added 7 commits October 22, 2024 09:50
Containerd pre-creates userns and netns before calling runc, which
results in the current code not working when SELinux is enabled,
resulting in the following error:

> runc create failed: unable to start container process: error during
container init: error mounting "mqueue" to rootfs at "/dev/mqueue":
setxattr /path/to/rootfs/dev/mqueue: operation not permitted

The solution is to become root in the user namespace right after
we join it.

Fixes opencontainers#4466.

Co-authored-by: Wei Fu <[email protected]>
Co-authored-by: Kir Kolyshkin <[email protected]>
Co-authored-by: Aleksa Sarai <[email protected]>
Signed-off-by: lifubang <[email protected]>
(cherry picked from commit c78f3f2)
Signed-off-by: Kir Kolyshkin <[email protected]>
Signed-off-by: lifubang <[email protected]>
(cherry picked from commit 34a9285)
Signed-off-by: Kir Kolyshkin <[email protected]>
[1.2] libct/nsenter: become root after joining userns
Since Go 1.19, the same functionality is there in os/exec package.
As we require go 1.22 now, there's no need to have this.

This basically reverts commit 9258eac ("libct/start: use execabs for
newuidmap lookup").

Signed-off-by: Kir Kolyshkin <[email protected]>
(cherry picked from commit eb2ff52)
Signed-off-by: Austin Vazquez <[email protected]>
…-eb2ff52ace1775ad667ca900b2e57e7d698e3484-to-1.2

[1.2] libct: rm x/sys/execabs usage
Because we have the overlay solution, we can drop runc-dmz binary
solution since it has too many limitations.

Signed-off-by: lifubang <[email protected]>
(cherry picked from commit 871057d)
Signed-off-by: lifubang <[email protected]>
@lifubang lifubang added the backport/1.2-pr A backport PR to release-1.2 label Oct 29, 2024
@lifubang lifubang added this to the 1.2.1 milestone Oct 29, 2024
@lifubang lifubang closed this Oct 29, 2024
@lifubang lifubang deleted the backport-4482 branch October 29, 2024 09:56
@lifubang lifubang restored the backport-4482 branch October 29, 2024 10:00
@lifubang lifubang removed this from the 1.2.1 milestone Oct 29, 2024
@lifubang lifubang removed the backport/1.2-pr A backport PR to release-1.2 label Oct 29, 2024
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.

3 participants