-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Fix runc exec vs go1.26 + older kernel #5091
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
Merged
+53
−3
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package libcontainer | ||
|
|
||
| import "os/exec" | ||
|
|
||
| // cloneCmd creates a copy of exec.Cmd. It is needed because cmd.Start | ||
| // must only be used once, and go1.26 actually enforces that (see | ||
| // https://go-review.googlesource.com/c/go/+/728642). The implementation | ||
| // is similar to | ||
| // | ||
| // cmd = *c | ||
| // return &cmd | ||
| // | ||
| // except it does not copy private fields, or fields populated | ||
| // after the call to cmd.Start. | ||
| // | ||
| // NOTE if Go will add exec.Cmd.Clone, we should switch to it. | ||
| func cloneCmd(c *exec.Cmd) *exec.Cmd { | ||
| cmd := &exec.Cmd{ | ||
| Path: c.Path, | ||
| Args: c.Args, | ||
| Env: c.Env, | ||
| Dir: c.Dir, | ||
| Stdin: c.Stdin, | ||
| Stdout: c.Stdout, | ||
| Stderr: c.Stderr, | ||
| ExtraFiles: c.ExtraFiles, | ||
| SysProcAttr: c.SysProcAttr, | ||
| // Don't copy Process, ProcessState, Err since | ||
| // these fields are populated after the start. | ||
|
|
||
| // Technically, we do not use Cancel or WaitDelay, | ||
| // but they are here for the sake of completeness. | ||
| Cancel: c.Cancel, | ||
| WaitDelay: c.WaitDelay, | ||
| } | ||
| return cmd | ||
| } | ||
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.