Skip to content

Commit d1d1676

Browse files
authored
Merge pull request #1175 from elezar/use-securejoin
Use securejoin to resolve /proc
2 parents 16bd33d + 2795ca6 commit d1d1676

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

internal/ldconfig/ldconfig_linux.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,12 @@ func createFileInRoot(containerRootDirPath string, destinationPath string, mode
166166

167167
// mountProc mounts a clean proc filesystem in the new root.
168168
func mountProc(newroot string) error {
169-
target := filepath.Join(newroot, "/proc")
170-
171-
if err := os.MkdirAll(target, 0755); err != nil {
172-
return fmt.Errorf("error creating directory: %w", err)
169+
target, err := securejoin.SecureJoin(newroot, "proc")
170+
if err != nil {
171+
return err
172+
}
173+
if err := utils.MkdirAllInRoot(newroot, target, 0755); err != nil {
174+
return err
173175
}
174176
return unix.Mount("proc", target, "proc", 0, "")
175177
}

0 commit comments

Comments
 (0)