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

Commit 8072480b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "debuggerd: fix passing of fdsan_table to crash_dump" into main am: cf32fd18 am: 611837f4 

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



Change-Id: Ib688d90912b77a70d7a8709251a60f148f04f5c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27e7f6d6 611837f4

debuggerd/handler/debuggerd_handler.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -552,8 +552,14 @@ static void debuggerd_signal_handler(int signal_number, siginfo_t* info, void* c 
  }

  }





  debugger_process_info process_info = {};

  debugger_process_info process_info = {};

  if (g_callbacks.get_process_info) {

    process_info = g_callbacks.get_process_info();

  }

  uintptr_t si_val = reinterpret_cast<uintptr_t>(info->si_ptr);

  uintptr_t si_val = reinterpret_cast<uintptr_t>(info->si_ptr);

  if (signal_number == BIONIC_SIGNAL_DEBUGGER) {

  if (signal_number == BIONIC_SIGNAL_DEBUGGER) {

    // Applications can set abort messages via android_set_abort_message without

    // actually aborting; ignore those messages in non-fatal dumps.

    process_info.abort_msg = nullptr;

    if (info->si_code == SI_QUEUE && info->si_pid == __getpid()) {

    if (info->si_code == SI_QUEUE && info->si_pid == __getpid()) {

      // Allow for the abort message to be explicitly specified via the sigqueue value.

      // Allow for the abort message to be explicitly specified via the sigqueue value.

      // Keep the bottom bit intact for representing whether we want a backtrace or a tombstone.

      // Keep the bottom bit intact for representing whether we want a backtrace or a tombstone.
@@ -562,8 +568,6 @@ static void debuggerd_signal_handler(int signal_number, siginfo_t* info, void* c 
        info->si_ptr = reinterpret_cast<void*>(si_val & 1);

        info->si_ptr = reinterpret_cast<void*>(si_val & 1);

      }

      }

    }

    }

  } else if (g_callbacks.get_process_info) {

    process_info = g_callbacks.get_process_info();

  }

  }





  gwp_asan_callbacks_t gwp_asan_callbacks = {};

  gwp_asan_callbacks_t gwp_asan_callbacks = {};