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

Enable sandboxed stack traces for coverage

Browse Source 
PiperOrigin-RevId: 561611676
Change-Id: I852eec8fc3728da1ae0b4bca8ccc9a628b8b5adc
This commit is contained in:
Wiktor Garbacz 2023-08-31 04:05:12 -07:00 committed by Copybara-Service
parent f715bd8ba9
commit dc25251af9
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sandboxed_api/sandbox2/BUILD.bazel
View File

@ -416,6 +416,7 @@ cc_library(
":comms", ":comms",
":executor", ":executor",
":limits", ":limits",
":mounts",
":namespace", ":namespace",
":policy", ":policy",
":policybuilder", ":policybuilder",

1
sandboxed_api/sandbox2/CMakeLists.txt
View File

@ -374,6 +374,7 @@ target_link_libraries(sandbox2_stack_trace
absl::time absl::time
sandbox2::client sandbox2::client
sandbox2::limits sandbox2::limits
sandbox2::mounts
sandbox2::policybuilder sandbox2::policybuilder
sandbox2::util sandbox2::util
sandbox2::unwind sandbox2::unwind

22
sandboxed_api/sandbox2/stack_trace.cc
View File

@ -21,7 +21,6 @@
#include <syscall.h> #include <syscall.h>
#include <unistd.h> #include <unistd.h>
#include <cstdlib>
#include <memory> #include <memory>
#include <string> #include <string>
#include <utility> #include <utility>
@ -42,6 +41,8 @@
#include "sandboxed_api/sandbox2/comms.h" #include "sandboxed_api/sandbox2/comms.h"
#include "sandboxed_api/sandbox2/executor.h" #include "sandboxed_api/sandbox2/executor.h"
#include "sandboxed_api/sandbox2/limits.h" #include "sandboxed_api/sandbox2/limits.h"
#include "sandboxed_api/sandbox2/mounts.h"
#include "sandboxed_api/sandbox2/namespace.h"
#include "sandboxed_api/sandbox2/policy.h" #include "sandboxed_api/sandbox2/policy.h"
#include "sandboxed_api/sandbox2/policybuilder.h" #include "sandboxed_api/sandbox2/policybuilder.h"
#include "sandboxed_api/sandbox2/regs.h" #include "sandboxed_api/sandbox2/regs.h"
@ -173,7 +174,8 @@ absl::StatusOr<std::unique_ptr<Policy>> StackTracePeer::GetPolicy(
absl::StrCat(target_pid), "maps")) absl::StrCat(target_pid), "maps"))
// Add the binary itself. // Add the binary itself.
.AddFileAt(exe_path, app_path); .AddFileAt(exe_path, app_path)
.AllowLlvmCoverage();
return builder.TryBuild(); return builder.TryBuild();
} }
@ -320,20 +322,14 @@ absl::StatusOr<std::vector<std::string>> GetStackTrace(
"Could not obtain stacktrace, regs == nullptr"); "Could not obtain stacktrace, regs == nullptr");
} }
// Show a warning if sandboxed libunwind is requested but we're running in if (!absl::GetFlag(FLAGS_sandbox_libunwind_crash_handler)) {
// an ASAN/coverage build (= we can't use sandboxed libunwind).
if (const bool coverage_enabled =
getenv("COVERAGE") != nullptr;
absl::GetFlag(FLAGS_sandbox_libunwind_crash_handler) &&
(sapi::sanitizers::IsAny() || coverage_enabled)) {
LOG_IF(WARNING, sapi::sanitizers::IsAny())
<< "Sanitizer build, using non-sandboxed libunwind";
LOG_IF(WARNING, coverage_enabled)
<< "Coverage build, using non-sandboxed libunwind";
return UnsafeGetStackTrace(regs->pid()); return UnsafeGetStackTrace(regs->pid());
} }
if (!absl::GetFlag(FLAGS_sandbox_libunwind_crash_handler)) { // Show a warning if sandboxed libunwind is requested but we're running in
// a sanitizer build (= we can't use sandboxed libunwind).
if (sapi::sanitizers::IsAny()) {
LOG(WARNING) << "Sanitizer build, using non-sandboxed libunwind";
return UnsafeGetStackTrace(regs->pid()); return UnsafeGetStackTrace(regs->pid());
} }