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.

Sign up for GitHub

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

Fix sandboxing hermetic tmp to take into account sandbox_base #22435

Closed
wants to merge 2 commits into from
Closed

Fix sandboxing hermetic tmp to take into account sandbox_base #22435

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ca75c7
Fix sandbox_base hermetic tmp
oquenchil May 17, 2024
e7204fc
Update src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandb…
oquenchil May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,10 @@ private ImmutableSet<Path> collectPathsToMountUnderHermeticTmp(CommandEnvironmen
// into the sandbox when using hermetic /tmp. We attempt to collect an over-approximation of
// these paths, as the main goal of hermetic /tmp is to avoid inheriting any direct
// or well-known children of /tmp from the host.
// TODO(bazel-team): Review all flags whose path may have to be considered here.
return Stream.concat(
Stream.of(cmdEnv.getOutputBase()),
Stream.concat(Stream.of(sandboxBase),
Stream.of(cmdEnv.getOutputBase())),
oquenchil marked this conversation as resolved.
Show resolved Hide resolved
cmdEnv.getPackageLocator().getPathEntries().stream().map(Root::asPath))
.filter(p -> p.startsWith(slashTmp))
// For any path /tmp/dir1/dir2 we encounter, we instead mount /tmp/dir1 (first two
Expand Down