daemon: scope container working directory creation with os.Root#52978
Open
SABITHSAHEB wants to merge 2 commits into
Open
daemon: scope container working directory creation with os.Root#52978SABITHSAHEB wants to merge 2 commits into
SABITHSAHEB wants to merge 2 commits into
Conversation
Signed-off-by: SABITH SAHEB <shabi7204192361@gmail.com>
SABITHSAHEB
force-pushed
the
scope-workdir-creation
branch
from
a5dfd7c to
4e70069
Compare
SABITHSAHEB
force-pushed
the
scope-workdir-creation
branch
from
1b507e9 to
720e71b
Compare
thaJeztah
reviewed
Jun 30, 2026
Comment on lines
-338
to
+343
| if err := user.MkdirAllAndChown(pth, 0o755, uid, gid, user.WithOnlyNew); err != nil { | ||
| pthInfo, err2 := os.Stat(pth) | ||
| if err2 == nil && pthInfo != nil && !pthInfo.IsDir() { | ||
| // GetResourcePath only guarantees that pth stays inside the container while | ||
| // none of its components is swapped for a symlink between resolution and use | ||
| // (see its doc comment). Re-rooting the creation in the container's BaseFS | ||
| // with [os.Root] makes that guarantee hold for every component on every | ||
| // operation, the same hardening applied to mount-destination creation in | ||
| // commit 64a22d80b9. | ||
| root, err := os.OpenRoot(container.BaseFS) |
Member
There was a problem hiding this comment.
Wondering if we should wait for
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
SetupWorkingDirectoryranmkdir/chownon a path fromGetResourcePath,which (per its own doc) is only safe while no component is swapped for a symlink
between resolution and use — letting the operation escape the container root.
This scopes the creation to an
os.Rooton the container'sBaseFS, whichre-checks every component and refuses to follow a symlink out of the root — the
same hardening applied to mount-destination creation in
64a22d80b9. Theonly-new create+chown is factored into a reusable
scopedMkdirAllAndChownhelper (chown skipped on Windows, as before), with unit and integration tests.