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

Jump to bottom

Fix bug with resolving relative symlinks during linux header detection #2038

Merged
merged 3 commits into from
Oct 11, 2024
Merged

Fix bug with resolving relative symlinks during linux header detection #2038

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be6ddb1
Fix bug with resolving relative symlinks during linux header detection
ddelnano Oct 3, 2024
0322c23
Resolve relative symlink instead of clobbering it. Remove unnecssary …
ddelnano Oct 11, 2024
ed7b839
Update logging to VLOG and address other feedback
ddelnano Oct 11, 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
15 changes: 14 additions & 1 deletion src/stirling/utils/linux_headers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,20 @@ StatusOr<std::filesystem::path> ResolvePossibleSymlinkToHostPath(const std::file
return error::Internal(ec.message());
}

const auto resolved_host_path = system::Config::GetInstance().ToHostPath(resolved);
// Relative paths containing "../" can result in an invalid host mount path when using
// ToHostPath. Therefore, we need to treat the absolute and relative cases differently.
std::filesystem::path resolved_host_path = p.parent_path();
ddelnano marked this conversation as resolved.
Show resolved Hide resolved
if (resolved.is_absolute()) {
resolved_host_path = system::Config::GetInstance().ToHostPath(resolved);
LOG(INFO) << absl::Substitute(
"Symlink target is an absolute path. Converting that to host path: $0 -> $1.",
resolved.string(), resolved_host_path.string());
} else {
resolved_host_path /= resolved.string();
LOG(INFO) << absl::Substitute(
"Symlink target is a relative path. Concatenating it to parent directory: $0",
resolved_host_path.string());
}
ddelnano marked this conversation as resolved.
Show resolved Hide resolved

// Downstream won't be ok unless the resolved host path exists; return an error if needed.
if (!fs::Exists(resolved_host_path)) {
Expand Down
Loading