stalker: Fix block events disrupting exclusive access on arm64 (#784)

frida · Feb 23, 2024 · 02a3e50 · 02a3e50
1 parent 8f54140
commit 02a3e50
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/gum/backend-arm64/gumstalker-arm64.c b/gum/backend-arm64/gumstalker-arm64.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2023 Håvard Sørbø <[email protected]>
  * Copyright (C) 2024 Francesco Tamagni <[email protected]>
  * Copyright (C) 2024 Alex Soler <[email protected]>
+ * Copyright (C) 2024 Sai Cao <[email protected]>
  *
  * Licence: wxWindows Library Licence, Version 3.1
  */
@@ -2900,7 +2901,9 @@ gum_stalker_iterator_next (GumStalkerIterator * self,
 
   self->generator_context->instruction = instruction;
 
-  if (is_first_instruction && (self->exec_context->sink_mask & GUM_BLOCK) != 0)
+  if (is_first_instruction &&
+     (self->exec_context->sink_mask & GUM_BLOCK) != 0 &&
+     (self->exec_block->flags & GUM_EXEC_BLOCK_USES_EXCLUSIVE_ACCESS) == 0)
   {
     gum_exec_block_write_block_event_code (self->exec_block, gc,
         GUM_CODE_INTERRUPTIBLE);