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

Commit 354bd064 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "debuggerd: recognize jumps to non-executable memory." into main

parents 293b3945 b17d7be2
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -356,6 +356,9 @@ static void dump_probable_cause(Tombstone* tombstone, unwindstack::AndroidUnwind
    auto map_info = maps->Find(fault_addr);
    if (map_info != nullptr && map_info->flags() == PROT_EXEC) {
      cause = "execute-only (no-read) memory access error; likely due to data in .text.";
    } else if (fault_addr == target_thread.registers->pc() &&
               map_info != nullptr && (map_info->flags() & PROT_EXEC) == 0) {
      cause = "trying to execute non-executable memory.";
    } else {
      cause = get_stack_overflow_cause(fault_addr, target_thread.registers->sp(), maps);
    }