Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f08a2d1 authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Automerger Merge Worker
Browse files

Merge "Support MTE and GWP-ASan features in proto tombstones." am: f4a40c0e... 

Merge "Support MTE and GWP-ASan features in proto tombstones." am: f4a40c0e am: 80e76de5 am: 117b0654

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1627339

Change-Id: I351456757e340a8a023b4fd329d5da1473cb9bdd
parents 720eec17 117b0654

debuggerd/debuggerd_test.cpp

+7 −10
Original line number Diff line number Diff line
@@ -502,12 +502,11 @@ TEST_P(SizeParamCrasherTest, mte_uaf) { 


  ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\))");

  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Use After Free, 0 bytes into a )" +

                           std::to_string(GetParam()) + R"(-byte allocation.*



allocated by thread .*

      #00 pc)");

                           std::to_string(GetParam()) + R"(-byte allocation)");

  ASSERT_MATCH(result, R"(deallocated by thread .*

      #00 pc)");

  ASSERT_MATCH(result, R"(allocated by thread .*

      #00 pc)");

#else

  GTEST_SKIP() << "Requires aarch64";

#endif
@@ -539,9 +538,8 @@ TEST_P(SizeParamCrasherTest, mte_overflow) { 


  ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\))");

  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Overflow, 0 bytes right of a )" +

                           std::to_string(GetParam()) + R"(-byte allocation.*



allocated by thread .*

                           std::to_string(GetParam()) + R"(-byte allocation)");

  ASSERT_MATCH(result, R"(allocated by thread .*

      #00 pc)");

#else

  GTEST_SKIP() << "Requires aarch64";
@@ -574,9 +572,8 @@ TEST_P(SizeParamCrasherTest, mte_underflow) { 


  ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\), code 9 \(SEGV_MTESERR\))");

  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Underflow, 4 bytes left of a )" +

                           std::to_string(GetParam()) + R"(-byte allocation.*



allocated by thread .*

                           std::to_string(GetParam()) + R"(-byte allocation)");

  ASSERT_MATCH(result, R"(allocated by thread .*

      #00 pc)");

#else

  GTEST_SKIP() << "Requires aarch64";

debuggerd/libdebuggerd/gwp_asan.cpp

+68 −6
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include "libdebuggerd/gwp_asan.h"

#include "libdebuggerd/tombstone.h"

#include "libdebuggerd/utility.h"



#include "gwp_asan/common.h"
@@ -25,6 +26,8 @@ 
#include <unwindstack/Regs.h>

#include <unwindstack/Unwinder.h>



#include "tombstone.pb.h"



// Retrieve GWP-ASan state from `state_addr` inside the process at

// `process_memory`. Place the state into `*state`.

static bool retrieve_gwp_asan_state(unwindstack::Memory* process_memory, uintptr_t state_addr,
@@ -98,6 +101,67 @@ bool GwpAsanCrashData::CrashIsMine() const { 
  return is_gwp_asan_responsible_;

}



constexpr size_t kMaxTraceLength = gwp_asan::AllocationMetadata::kMaxTraceLengthToCollect;



void GwpAsanCrashData::AddCauseProtos(Tombstone* tombstone, unwindstack::Unwinder* unwinder) const {

  if (!CrashIsMine()) {

    ALOGE("Internal Error: AddCauseProtos() on a non-GWP-ASan crash.");

    return;

  }



  Cause* cause = tombstone->add_causes();

  MemoryError* memory_error = cause->mutable_memory_error();

  HeapObject* heap_object = memory_error->mutable_heap();



  memory_error->set_tool(MemoryError_Tool_GWP_ASAN);

  switch (error_) {

    case gwp_asan::Error::USE_AFTER_FREE:

      memory_error->set_type(MemoryError_Type_USE_AFTER_FREE);

      break;

    case gwp_asan::Error::DOUBLE_FREE:

      memory_error->set_type(MemoryError_Type_DOUBLE_FREE);

      break;

    case gwp_asan::Error::INVALID_FREE:

      memory_error->set_type(MemoryError_Type_INVALID_FREE);

      break;

    case gwp_asan::Error::BUFFER_OVERFLOW:

      memory_error->set_type(MemoryError_Type_BUFFER_OVERFLOW);

      break;

    case gwp_asan::Error::BUFFER_UNDERFLOW:

      memory_error->set_type(MemoryError_Type_BUFFER_UNDERFLOW);

      break;

    default:

      memory_error->set_type(MemoryError_Type_UNKNOWN);

      break;

  }



  heap_object->set_address(__gwp_asan_get_allocation_address(responsible_allocation_));

  heap_object->set_size(__gwp_asan_get_allocation_size(responsible_allocation_));

  unwinder->SetDisplayBuildID(true);



  std::unique_ptr<uintptr_t[]> frames(new uintptr_t[kMaxTraceLength]);



  heap_object->set_allocation_tid(__gwp_asan_get_allocation_thread_id(responsible_allocation_));

  size_t num_frames =

      __gwp_asan_get_allocation_trace(responsible_allocation_, frames.get(), kMaxTraceLength);

  for (size_t i = 0; i != num_frames; ++i) {

    unwindstack::FrameData frame_data = unwinder->BuildFrameFromPcOnly(frames[i]);

    BacktraceFrame* f = heap_object->add_allocation_backtrace();

    fill_in_backtrace_frame(f, frame_data, unwinder->GetMaps());

  }



  heap_object->set_deallocation_tid(__gwp_asan_get_deallocation_thread_id(responsible_allocation_));

  num_frames =

      __gwp_asan_get_deallocation_trace(responsible_allocation_, frames.get(), kMaxTraceLength);

  for (size_t i = 0; i != num_frames; ++i) {

    unwindstack::FrameData frame_data = unwinder->BuildFrameFromPcOnly(frames[i]);

    BacktraceFrame* f = heap_object->add_deallocation_backtrace();

    fill_in_backtrace_frame(f, frame_data, unwinder->GetMaps());

  }



  set_human_readable_cause(cause, crash_address_);

}



void GwpAsanCrashData::DumpCause(log_t* log) const {

  if (!CrashIsMine()) {

    ALOGE("Internal Error: DumpCause() on a non-GWP-ASan crash.");
@@ -150,8 +214,6 @@ void GwpAsanCrashData::DumpCause(log_t* log) const { 
       error_string_, diff, byte_suffix, location_str, alloc_size, alloc_address);

}



constexpr size_t kMaxTraceLength = gwp_asan::AllocationMetadata::kMaxTraceLengthToCollect;



bool GwpAsanCrashData::HasDeallocationTrace() const {

  assert(CrashIsMine() && "HasDeallocationTrace(): Crash is not mine!");

  if (!responsible_allocation_ || !__gwp_asan_is_deallocated(responsible_allocation_)) {
@@ -164,7 +226,7 @@ void GwpAsanCrashData::DumpDeallocationTrace(log_t* log, unwindstack::Unwinder* 
  assert(HasDeallocationTrace() && "DumpDeallocationTrace(): No dealloc trace!");

  uint64_t thread_id = __gwp_asan_get_deallocation_thread_id(responsible_allocation_);



  std::unique_ptr<uintptr_t> frames(new uintptr_t[kMaxTraceLength]);

  std::unique_ptr<uintptr_t[]> frames(new uintptr_t[kMaxTraceLength]);

  size_t num_frames =

      __gwp_asan_get_deallocation_trace(responsible_allocation_, frames.get(), kMaxTraceLength);
@@ -176,7 +238,7 @@ void GwpAsanCrashData::DumpDeallocationTrace(log_t* log, unwindstack::Unwinder* 


  unwinder->SetDisplayBuildID(true);

  for (size_t i = 0; i < num_frames; ++i) {

    unwindstack::FrameData frame_data = unwinder->BuildFrameFromPcOnly(frames.get()[i]);

    unwindstack::FrameData frame_data = unwinder->BuildFrameFromPcOnly(frames[i]);

    frame_data.num = i;

    _LOG(log, logtype::BACKTRACE, "    %s\n", unwinder->FormatFrame(frame_data).c_str());

  }
@@ -191,7 +253,7 @@ void GwpAsanCrashData::DumpAllocationTrace(log_t* log, unwindstack::Unwinder* un 
  assert(HasAllocationTrace() && "DumpAllocationTrace(): No dealloc trace!");

  uint64_t thread_id = __gwp_asan_get_allocation_thread_id(responsible_allocation_);



  std::unique_ptr<uintptr_t> frames(new uintptr_t[kMaxTraceLength]);

  std::unique_ptr<uintptr_t[]> frames(new uintptr_t[kMaxTraceLength]);

  size_t num_frames =

      __gwp_asan_get_allocation_trace(responsible_allocation_, frames.get(), kMaxTraceLength);
@@ -203,7 +265,7 @@ void GwpAsanCrashData::DumpAllocationTrace(log_t* log, unwindstack::Unwinder* un 


  unwinder->SetDisplayBuildID(true);

  for (size_t i = 0; i < num_frames; ++i) {

    unwindstack::FrameData frame_data = unwinder->BuildFrameFromPcOnly(frames.get()[i]);

    unwindstack::FrameData frame_data = unwinder->BuildFrameFromPcOnly(frames[i]);

    frame_data.num = i;

    _LOG(log, logtype::BACKTRACE, "    %s\n", unwinder->FormatFrame(frame_data).c_str());

  }

debuggerd/libdebuggerd/include/libdebuggerd/gwp_asan.h

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
#include "types.h"

#include "utility.h"



class Cause;

class Tombstone;



class GwpAsanCrashData {

 public:

  GwpAsanCrashData() = delete;
@@ -69,6 +72,8 @@ class GwpAsanCrashData { 
  // HasAllocationTrace() returns true.

  void DumpAllocationTrace(log_t* log, unwindstack::Unwinder* unwinder) const;



  void AddCauseProtos(Tombstone* tombstone, unwindstack::Unwinder* unwinder) const;



 protected:

  // Is GWP-ASan responsible for this crash.

  bool is_gwp_asan_responsible_ = false;

debuggerd/libdebuggerd/include/libdebuggerd/scudo.h

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 


#include "scudo/interface.h"



class Cause;

class Tombstone;



class ScudoCrashData {

 public:

  ScudoCrashData() = delete;
@@ -32,6 +35,7 @@ class ScudoCrashData { 
  bool CrashIsMine() const;



  void DumpCause(log_t* log, unwindstack::Unwinder* unwinder) const;

  void AddCauseProtos(Tombstone* tombstone, unwindstack::Unwinder* unwinder) const;



 private:

  scudo_error_info error_info_ = {};
@@ -39,4 +43,7 @@ class ScudoCrashData { 


  void DumpReport(const scudo_error_report* report, log_t* log,

                  unwindstack::Unwinder* unwinder) const;



  void FillInCause(Cause* cause, const scudo_error_report* report,

                   unwindstack::Unwinder* unwinder) const;

};

debuggerd/libdebuggerd/include/libdebuggerd/tombstone.h

+8 −0
Original line number Diff line number Diff line
@@ -31,9 +31,13 @@ 
#include "types.h"



// Forward declarations

class BacktraceFrame;

class Cause;

class Tombstone;



namespace unwindstack {

struct FrameData;

class Maps;

class Unwinder;

}
@@ -64,4 +68,8 @@ bool tombstone_proto_to_text( 
    const Tombstone& tombstone,

    std::function<void(const std::string& line, bool should_log)> callback);



void fill_in_backtrace_frame(BacktraceFrame* f, const unwindstack::FrameData& frame,

                             unwindstack::Maps* maps);

void set_human_readable_cause(Cause* cause, uint64_t fault_addr);



#endif  // _DEBUGGERD_TOMBSTONE_H