StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

stack_trace: avoid copying /proc/{pid}/exe if possible

Browse Source 
The executable might not be inside the mount tree.

PiperOrigin-RevId: 539564862
Change-Id: I94e748608a36c8e9203ffe4b6de443e026e4546a
This commit is contained in:
Wiktor Garbacz 2023-06-12 00:14:06 -07:00 committed by Copybara-Service
parent 045ace8dcb
commit 654668fc4e
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sandboxed_api/sandbox2/stack_trace.cc
View File

@ -18,9 +18,11 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/stat.h>
#include <syscall.h> #include <syscall.h>
#include <memory> #include <memory>
#include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>
@ -65,6 +67,20 @@ absl::StatusOr<std::vector<std::string>> UnsafeGetStackTrace(pid_t pid) {
return RunLibUnwindAndSymbolizer(pid, kDefaultMaxFrames); return RunLibUnwindAndSymbolizer(pid, kDefaultMaxFrames);
} }
bool IsSameFile(const std::string& path, const std::string& other) {
struct stat buf, other_buf;
if (stat(path.c_str(), &buf) != 0 || stat(other.c_str(), &other_buf) != 0) {
return false;
}
return buf.st_dev == other_buf.st_dev && buf.st_ino == other_buf.st_ino &&
buf.st_mode == other_buf.st_mode &&
buf.st_nlink == other_buf.st_nlink && buf.st_uid == other_buf.st_uid &&
buf.st_gid == other_buf.st_gid && buf.st_rdev == other_buf.st_rdev &&
buf.st_size == other_buf.st_size &&
buf.st_blksize == other_buf.st_blksize &&
buf.st_blocks == other_buf.st_blocks;
}
} // namespace } // namespace
class StackTracePeer { class StackTracePeer {
@ -211,11 +227,14 @@ absl::StatusOr<std::vector<std::string>> StackTracePeer::LaunchLibunwindSandbox(
return absl::InternalError("Could not obtain absolute path to the binary"); return absl::InternalError("Could not obtain absolute path to the binary");
} }
// The exe_path will have a mountable path of the application, even if it was std::string exe_path;
// removed. if (IsSameFile(app_path, proc_pid_exe)) {
// Resolve app_path backing file. exe_path = app_path;
std::string exe_path = } else {
ns ? ns->mounts().ResolvePath(app_path).value_or("") : ""; // The exe_path will have a mountable path of the application, even if it
// was removed. Resolve app_path backing file.
exe_path = ns ? ns->mounts().ResolvePath(app_path).value_or("") : "";
}
if (exe_path.empty()) { if (exe_path.empty()) {
// File was probably removed. // File was probably removed.