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

Commit 118c5ee6 authored by Peter Collingbourne's avatar Peter Collingbourne
Browse files

Switch to new kernel ptrace interface for reading tags.

Bug: 135772972
Change-Id: I506429d7bff79f83828e1f0d5c0ea0468ee1580b
parent d694a678
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
#if defined(ANDROID_EXPERIMENTAL_MTE)

#include <sys/ptrace.h>
#include <sys/uio.h>

#include <bionic/mte.h>
#include <bionic/mte_kernel.h>
@@ -28,7 +29,13 @@ namespace unwindstack {

long MemoryRemote::ReadTag(uint64_t addr) {
#if defined(__aarch64__)
  return ptrace(PTRACE_PEEKTAG, pid_, (void*)addr, nullptr);
  char tag;
  iovec iov = {&tag, 1};
  if (ptrace(PTRACE_PEEKMTETAGS, pid_, reinterpret_cast<void*>(addr), &iov) != 0 ||
      iov.iov_len != 1) {
    return -1;
  }
  return tag;
#else
  (void)addr;
  return -1;