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 bug that threw an error while searching for linux headers through a symlink #1821

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Fix bug that threw an error while searching for linux headers through a symlink #1821

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebb73d4
Properly resolve symlink to host path
kpattaswamy Jan 18, 2024
5b911f6
Update the error log
kpattaswamy Jan 25, 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
8 changes: 2 additions & 6 deletions src/stirling/utils/linux_headers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,16 +210,12 @@ Status FindLinuxHeadersDirectory(const std::filesystem::path& lib_modules_dir) {
}

StatusOr<std::filesystem::path> ResolvePossibleSymlinkToHostPath(const std::filesystem::path p) {
// The rest of this won't work if "p" does not exist. Go ahead and error out early if needed.
if (!fs::Exists(p)) {
return error::NotFound(absl::Substitute("Did not find host headers at path: $0.", p.string()));
}

// Check if "p" is a symlink.
std::error_code ec;
const bool is_symlink = std::filesystem::is_symlink(p, ec);
if (ec) {
return error::Internal(ec.message());
return error::NotFound(absl::Substitute("Did not find the host headers at path: $0, $1.",
p.string(), ec.message()));
}

if (!is_symlink) {
Expand Down
Loading