Index: lib/sanitizer_common/sanitizer_posix_libcdep.cc
===================================================================
--- lib/sanitizer_common/sanitizer_posix_libcdep.cc
+++ lib/sanitizer_common/sanitizer_posix_libcdep.cc
@@ -230,7 +230,7 @@
   // take it into account.
   bool IsStackAccess = addr >= (sp & ~0xFFF) && addr < sp + 0xFFFF;
 #else
-  bool IsStackAccess = addr + 512 > sp && addr < sp + 0xFFFF;
+  bool IsStackAccess = addr + GetPageSizeCached() > sp && addr < sp + 0xFFFF;
 #endif
 
 #if __powerpc__
Index: test/asan/TestCases/scariness_score_test.cc
===================================================================
--- test/asan/TestCases/scariness_score_test.cc
+++ test/asan/TestCases/scariness_score_test.cc
@@ -115,7 +115,7 @@
 }
 
 void StackOverflow(int Idx) {
-  int some_stack[10000];
+  int some_stack[256];
   static volatile int *x;
   x = &some_stack[0];
   if (Idx > 0)