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

Commit 1eaf3302 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I091d3dc9,Id06e4329 

* changes:
  [MTE] add link to SAC docs to tombstones
  [Refactor] move memory map printing to helper
parents 09545d14 1d79a075

debuggerd/libdebuggerd/tombstone_proto_to_text.cpp

+90 −76
Original line number Diff line number Diff line
@@ -303,9 +303,84 @@ static void print_tag_dump(CallbackType callback, const Tombstone& tombstone) { 
  }

}



static void print_memory_maps(CallbackType callback, const Tombstone& tombstone) {

  int word_size = pointer_width(tombstone);

  const auto format_pointer = [word_size](uint64_t ptr) -> std::string {

    if (word_size == 8) {

      uint64_t top = ptr >> 32;

      uint64_t bottom = ptr & 0xFFFFFFFF;

      return StringPrintf("%08" PRIx64 "'%08" PRIx64, top, bottom);

    }



    return StringPrintf("%0*" PRIx64, word_size * 2, ptr);

  };



  std::string memory_map_header =

      StringPrintf("memory map (%d %s):", tombstone.memory_mappings().size(),

                   tombstone.memory_mappings().size() == 1 ? "entry" : "entries");



  const Signal& signal_info = tombstone.signal_info();

  bool has_fault_address = signal_info.has_fault_address();

  uint64_t fault_address = untag_address(signal_info.fault_address());

  bool preamble_printed = false;

  bool printed_fault_address_marker = false;

  for (const auto& map : tombstone.memory_mappings()) {

    if (!preamble_printed) {

      preamble_printed = true;

      if (has_fault_address) {

        if (fault_address < map.begin_address()) {

          memory_map_header +=

              StringPrintf("\n--->Fault address falls at %s before any mapped regions",

                           format_pointer(fault_address).c_str());

          printed_fault_address_marker = true;

        } else {

          memory_map_header += " (fault address prefixed with --->)";

        }

      }

      CBS("%s", memory_map_header.c_str());

    }



    std::string line = "    ";

    if (has_fault_address && !printed_fault_address_marker) {

      if (fault_address < map.begin_address()) {

        printed_fault_address_marker = true;

        CBS("--->Fault address falls at %s between mapped regions",

            format_pointer(fault_address).c_str());

      } else if (fault_address >= map.begin_address() && fault_address < map.end_address()) {

        printed_fault_address_marker = true;

        line = "--->";

      }

    }

    StringAppendF(&line, "%s-%s", format_pointer(map.begin_address()).c_str(),

                  format_pointer(map.end_address() - 1).c_str());

    StringAppendF(&line, " %s%s%s", map.read() ? "r" : "-", map.write() ? "w" : "-",

                  map.execute() ? "x" : "-");

    StringAppendF(&line, "  %8" PRIx64 "  %8" PRIx64, map.offset(),

                  map.end_address() - map.begin_address());



    if (!map.mapping_name().empty()) {

      StringAppendF(&line, "  %s", map.mapping_name().c_str());



      if (!map.build_id().empty()) {

        StringAppendF(&line, " (BuildId: %s)", map.build_id().c_str());

      }



      if (map.load_bias() != 0) {

        StringAppendF(&line, " (load bias 0x%" PRIx64 ")", map.load_bias());

      }

    }



    CBS("%s", line.c_str());

  }



  if (has_fault_address && !printed_fault_address_marker) {

    CBS("--->Fault address falls at %s after any mapped regions",

        format_pointer(fault_address).c_str());

  }

}



static void print_main_thread(CallbackType callback, const Tombstone& tombstone,

                              const Thread& thread) {

  int word_size = pointer_width(tombstone);

  print_thread_header(callback, tombstone, thread, true);



  const Signal& signal_info = tombstone.signal_info();
@@ -317,12 +392,14 @@ static void print_main_thread(CallbackType callback, const Tombstone& tombstone, 
  }



  bool is_async_mte_crash = false;

  bool is_mte_crash = false;

  if (!tombstone.has_signal_info()) {

    CBL("signal information missing");

  } else {

    std::string fault_addr_desc;

    if (signal_info.has_fault_address()) {

      fault_addr_desc = StringPrintf("0x%0*" PRIx64, 2 * word_size, signal_info.fault_address());

      fault_addr_desc =

          StringPrintf("0x%0*" PRIx64, 2 * pointer_width(tombstone), signal_info.fault_address());

    } else {

      fault_addr_desc = "--------";

    }
@@ -332,6 +409,8 @@ static void print_main_thread(CallbackType callback, const Tombstone& tombstone, 
        sender_desc.c_str(), fault_addr_desc.c_str());

#ifdef SEGV_MTEAERR

    is_async_mte_crash = signal_info.number() == SIGSEGV && signal_info.code() == SEGV_MTEAERR;

    is_mte_crash = is_async_mte_crash ||

                   (signal_info.number() == SIGSEGV && signal_info.code() == SEGV_MTESERR);

#endif

  }
@@ -382,86 +461,21 @@ static void print_main_thread(CallbackType callback, const Tombstone& tombstone, 


  print_tag_dump(callback, tombstone);



  print_thread_memory_dump(callback, tombstone, thread);



  if (is_mte_crash) {

    CBS("");



  // No memory maps to print.

  if (tombstone.memory_mappings().empty()) {

    CBS("No memory maps found");

    return;

    CBL("Learn more about MTE reports: "

        "https://source.android.com/docs/security/test/memory-safety/mte-reports");

  }



  const auto format_pointer = [word_size](uint64_t ptr) -> std::string {

    if (word_size == 8) {

      uint64_t top = ptr >> 32;

      uint64_t bottom = ptr & 0xFFFFFFFF;

      return StringPrintf("%08" PRIx64 "'%08" PRIx64, top, bottom);

    }



    return StringPrintf("%0*" PRIx64, word_size * 2, ptr);

  };

  print_thread_memory_dump(callback, tombstone, thread);



  std::string memory_map_header =

      StringPrintf("memory map (%d %s):", tombstone.memory_mappings().size(),

                   tombstone.memory_mappings().size() == 1 ? "entry" : "entries");

  CBS("");



  bool has_fault_address = signal_info.has_fault_address();

  uint64_t fault_address = untag_address(signal_info.fault_address());

  bool preamble_printed = false;

  bool printed_fault_address_marker = false;

  for (const auto& map : tombstone.memory_mappings()) {

    if (!preamble_printed) {

      preamble_printed = true;

      if (has_fault_address) {

        if (fault_address < map.begin_address()) {

          memory_map_header +=

              StringPrintf("\n--->Fault address falls at %s before any mapped regions",

                           format_pointer(fault_address).c_str());

          printed_fault_address_marker = true;

  // No memory maps to print.

  if (!tombstone.memory_mappings().empty()) {

    print_memory_maps(callback, tombstone);

  } else {

          memory_map_header += " (fault address prefixed with --->)";

        }

      }

      CBS("%s", memory_map_header.c_str());

    }



    std::string line = "    ";

    if (has_fault_address && !printed_fault_address_marker) {

      if (fault_address < map.begin_address()) {

        printed_fault_address_marker = true;

        CBS("--->Fault address falls at %s between mapped regions",

            format_pointer(fault_address).c_str());

      } else if (fault_address >= map.begin_address() && fault_address < map.end_address()) {

        printed_fault_address_marker = true;

        line = "--->";

      }

    }

    StringAppendF(&line, "%s-%s", format_pointer(map.begin_address()).c_str(),

                  format_pointer(map.end_address() - 1).c_str());

    StringAppendF(&line, " %s%s%s", map.read() ? "r" : "-", map.write() ? "w" : "-",

                  map.execute() ? "x" : "-");

    StringAppendF(&line, "  %8" PRIx64 "  %8" PRIx64, map.offset(),

                  map.end_address() - map.begin_address());



    if (!map.mapping_name().empty()) {

      StringAppendF(&line, "  %s", map.mapping_name().c_str());



      if (!map.build_id().empty()) {

        StringAppendF(&line, " (BuildId: %s)", map.build_id().c_str());

      }



      if (map.load_bias() != 0) {

        StringAppendF(&line, " (load bias 0x%" PRIx64 ")", map.load_bias());

      }

    }



    CBS("%s", line.c_str());

  }



  if (has_fault_address && !printed_fault_address_marker) {

    CBS("--->Fault address falls at %s after any mapped regions",

        format_pointer(fault_address).c_str());

    CBS("No memory maps found");

  }

}