- Notifications
You must be signed in to change notification settings - Fork2.2k
[1.4] libct: close child fds on prepareCgroupFD error#4936
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
lifubang merged 2 commits intoopencontainers:release-1.4fromcyphar:1.4-fix-prepare-cgroup-fd-closeOct 16, 2025
Merged
[1.4] libct: close child fds on prepareCgroupFD error#4936
lifubang merged 2 commits intoopencontainers:release-1.4fromcyphar:1.4-fix-prepare-cgroup-fd-closeOct 16, 2025
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
The (*setns).start is supposed to close child fds once the child hasstarted, or upon an error. Commit5af4dd4 added a bug -- child fdsare not closed if prepareCgroupFD fails.Fix by adding a missing call to closeChild.I'm not sure how to write a good test case for it. Found when workingon PR 4928 (and tested in there).Fixes:5af4dd4Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>(cherry picked from commit4e26250)Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
Factor startWithCgroupFD out of start to reduce the start complexity.This also implements a more future-proof way of calling p.comm.closeChild.Co-authored-by: lifubang <lifubang@acmcoder.com>Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>(cherry picked from commit871052b)Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
kolyshkin approved these changesOct 15, 2025
Contributor
kolyshkin left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
lgtm
lifubang approved these changesOct 16, 2025
1984e2c intoopencontainers:release-1.4 36 checks passed
Uh oh!
There was an error while loading.Please reload this page.
Merged
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of#4930
The
(*setns).startis supposed to close child fds once the child has started, or upon returning an error.There was no code to return an error before calling start, but commit5af4dd4 added it, together with
a bug -- child fds are not closed if prepareCgroupFD fails.
I'm not sure ifhow to add a good test case for it. Found when working on PR#4928 (which modified the code
to read the child logs even when start() fails).
Fixes:5af4dd4 / PR#4812.
This PR also includes the refactoring of start to avoid similar problems in the future.