Check stack pointer to be inside the stack when unwinding on Linux.

base/debug/stack_trace.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/debug/stack_trace.h"
 
 #include <string.h>
 
 #include <algorithm>
+#include <limits>
 #include <sstream>
 
 #include "base/macros.h"
 
-#if HAVE_TRACE_STACK_FRAME_POINTERS && defined(OS_ANDROID)

[Primiano Tucci (use gerrit), 2016/08/03 09:32:03]

I think you still need OS_POSIX otherwise that include pthread.h will fail on
Win

[Dmitry Skiba, 2016/08/11 16:52:38]

Done.

+#if HAVE_TRACE_STACK_FRAME_POINTERS
 #include <pthread.h>
 #include "base/process/process_handle.h"
 #include "base/threading/platform_thread.h"
 #endif
 
 namespace base {
 namespace debug {
 
 StackTrace::StackTrace(const void* const* trace, size_t count) {
   count = std::min(count, arraysize(trace_));
@@ skipping 17 matching lines @@
 #if !defined(__UCLIBC__)
   OutputToStream(&stream);
 #endif
   return stream.str();
 }
 
 #if HAVE_TRACE_STACK_FRAME_POINTERS
 
 #if defined(OS_ANDROID)
 
+#define HAVE_GET_STACK_END 1
+
 static uintptr_t GetStackEnd() {

[Primiano Tucci (use gerrit), 2016/08/03 09:32:03]

I think all this become more readable and easy to thinkg about if instead of the
extra HAVE_GET_STACK_END and #ifdef you do:

- Always define GetStackEnd().
- Put the #ifdef inside, so it will look like:

static uintptr_t GetStackEnd() {
bool is_main_thread = GetCurrentProcId() == PlatformThread::CurrentId();

#if defined(OS_ANDROID)
bla bla pthread
#elif defined(OS_LINUX) && defined(__GLIBC__)
bla bla __libc bla
#else
return std::numeric_limits bla
}

[Dmitry Skiba, 2016/08/11 16:52:38]

Done.

   // Bionic reads proc/maps on every call to pthread_getattr_np() when called
   // from the main thread. So we need to cache end of stack in that case to get
   // acceptable performance.
   // For all other threads pthread_getattr_np() is fast enough as it just reads
   // values from its pthread_t argument.
   static uintptr_t main_stack_end = 0;
 
   bool is_main_thread = GetCurrentProcId() == PlatformThread::CurrentId();
 
   if (is_main_thread && main_stack_end) {
@@ skipping 15 matching lines @@
 
   uintptr_t stack_end = stack_begin + stack_size;
   if (is_main_thread) {
     main_stack_end = stack_end;
   }
   return stack_end;
 }
 
 #endif  // defined(OS_ANDROID)
 
+#if defined(__GLIBC__)

[Primiano Tucci (use gerrit), 2016/08/03 09:32:03]

Just change lines 89-91 to be:

#elif defined(OS_LINUX) && defined(__GLIBC__)

[Dmitry Skiba, 2016/08/11 16:52:38]

Done.

+
+#define HAVE_GET_STACK_END 1
+
+extern "C" void* __libc_stack_end;

[Primiano Tucci (use gerrit), 2016/08/03 09:32:04]

Ok it seems we already depend on this in StackFrameDepth.cpp, so you are not
really adding a new libc symbol dependency, good.

[Dmitry Skiba, 2016/08/11 16:52:38]

Acknowledged.

+
+static uintptr_t GetStackEnd() {
+  if (GetCurrentProcId() == PlatformThread::CurrentId()) {
+    // For the main thread we have a shortcut.
+    return reinterpret_cast<uintptr_t>(__libc_stack_end);
+  } else {
+    // No easy way to get stack end for non-main threads,
+    // see crbug.com/617730.
+    return std::numeric_limits<uintptr_t>::max();
+  }
+}
+
+#endif  // defined(__GLIBC__)
+
 size_t TraceStackFramePointers(const void** out_trace,
                                size_t max_depth,
                                size_t skip_initial) {
   // Usage of __builtin_frame_address() enables frame pointers in this
   // function even if they are not enabled globally. So 'sp' will always
   // be valid.
   uintptr_t sp = reinterpret_cast<uintptr_t>(__builtin_frame_address(0));
 
-#if defined(OS_ANDROID)
+#if HAVE_GET_STACK_END
   uintptr_t stack_end = GetStackEnd();
 #endif
 
   size_t depth = 0;
   while (depth < max_depth) {
 #if defined(__arm__) && defined(__GNUC__) && !defined(__clang__)
     // GCC and LLVM generate slightly different frames on ARM, see
     // https://llvm.org/bugs/show_bug.cgi?id=18505 - LLVM generates
     // x86-compatible frame, while GCC needs adjustment.
     sp -= sizeof(uintptr_t);
 #endif
 
-#if defined(OS_ANDROID)
+#if HAVE_GET_STACK_END
     // Both sp[0] and s[1] must be valid.
     if (sp + 2 * sizeof(uintptr_t) > stack_end) {
       break;
     }
 #endif
 
     if (skip_initial != 0) {
       skip_initial--;
     } else {
       out_trace[depth++] = reinterpret_cast<const void**>(sp)[1];
@@ skipping 18 matching lines @@
     }
   }
 
   return depth;
 }
 
 #endif  // HAVE_TRACE_STACK_FRAME_POINTERS
 
 }  // namespace debug
 }  // namespace base