From ad2be02a833e56f7fe280797280b219eb3312621 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 16 Oct 2020 15:08:52 +0200 Subject: [PATCH] ASAN: Support detect_invalid_pointer_pairs=1 with detect_stack_use_after_return=1 Do not crash when AsanThread::GetStackVariableShadowStart does not find a variable for a pointer on a shadow stack. Differential Revision: https://reviews.llvm.org/D89552 --- compiler-rt/lib/asan/asan_thread.cpp | 4 +++- .../test/asan/TestCases/invalid-pointer-pairs-subtract-success.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler-rt/lib/asan/asan_thread.cpp b/compiler-rt/lib/asan/asan_thread.cpp index f0df8bd..58cdc29 100644 --- a/compiler-rt/lib/asan/asan_thread.cpp +++ b/compiler-rt/lib/asan/asan_thread.cpp @@ -366,7 +366,9 @@ uptr AsanThread::GetStackVariableShadowStart(uptr addr) { bottom = stack_bottom(); } else if (has_fake_stack()) { bottom = fake_stack()->AddrIsInFakeStack(addr); - CHECK(bottom); + if (bottom == 0) { + return 0; + } } else { return 0; } diff --git a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-success.cpp b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-success.cpp index 7ea120e..79714c7 100644 --- a/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-success.cpp +++ b/compiler-rt/test/asan/TestCases/invalid-pointer-pairs-subtract-success.cpp @@ -1,6 +1,7 @@ // RUN: %clangxx_asan -O0 %s -o %t -mllvm -asan-detect-invalid-pointer-pair // RUN: %env_asan_opts=detect_invalid_pointer_pairs=2 %run %t +// RUN: %env_asan_opts=detect_invalid_pointer_pairs=2,detect_stack_use_after_return=1 %run %t #include #include -- 2.7.4