diff options
| -rw-r--r-- | compiler-rt/lib/asan/asan_report.cc | 2 | ||||
| -rw-r--r-- | compiler-rt/test/asan/TestCases/Linux/stack-overflow-recovery-mode.cc | 36 |
2 files changed, 37 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/asan_report.cc b/compiler-rt/lib/asan/asan_report.cc index 568d06bb1e5..15817e3a659 100644 --- a/compiler-rt/lib/asan/asan_report.cc +++ b/compiler-rt/lib/asan/asan_report.cc @@ -739,7 +739,7 @@ StaticSpinMutex ScopedInErrorReport::lock_; u32 ScopedInErrorReport::reporting_thread_tid_; void ReportStackOverflow(const SignalContext &sig) { - ScopedInErrorReport in_report; + ScopedInErrorReport in_report(/*report*/ nullptr, /*fatal*/ true); Decorator d; Printf("%s", d.Warning()); Report( diff --git a/compiler-rt/test/asan/TestCases/Linux/stack-overflow-recovery-mode.cc b/compiler-rt/test/asan/TestCases/Linux/stack-overflow-recovery-mode.cc new file mode 100644 index 00000000000..e9966595378 --- /dev/null +++ b/compiler-rt/test/asan/TestCases/Linux/stack-overflow-recovery-mode.cc @@ -0,0 +1,36 @@ +// Test that ASan doesn't hang on stack overflow in recovery mode. +// +// RUN: %clang_asan -O0 -fsanitize-recover=address %s -o %t +// RUN: %env_asan_opts=halt_on_error=false not %run %t 2>&1 | FileCheck %s + +#include <assert.h> +#include <unistd.h> +#include <sys/mman.h> +#include <sys/resource.h> + +static volatile int *recurse(volatile int n, volatile int *p) { + // CHECK: {{stack-overflow on address 0x.* \(pc 0x.* bp 0x.* sp 0x.* T.*\)}} + if (n >= 0) *recurse(n + 1, p) += n; + return p; +} + + +void LimitStackAndReexec(int argc, char **argv) { + struct rlimit rlim; + int res = getrlimit(RLIMIT_STACK, &rlim); + assert(res == 0); + if (rlim.rlim_cur == RLIM_INFINITY) { + rlim.rlim_cur = 256 * 1024; + res = setrlimit(RLIMIT_STACK, &rlim); + assert(res == 0); + + execv(argv[0], argv); + assert(0 && "unreachable"); + } +} + +int main(int argc, char **argv) { + LimitStackAndReexec(argc, argv); + volatile int res; + return *recurse(argc + 1, &res); +} |
