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

Commit 88c3a14b authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Merge "Allow another prctl call." am: 8711f728 am: 8eb74b03 

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

Change-Id: I4f93f571f5bc061de4ce74e96585c569d2de88d6
parents cb1d0fbc 8eb74b03

debuggerd/debuggerd_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ void CrasherTest::AssertDeath(int signo) { 
  }



  if (signo == 0) {

    ASSERT_TRUE(WIFEXITED(status));

    ASSERT_TRUE(WIFEXITED(status)) << "Terminated due to unexpected signal " << WTERMSIG(status);

    ASSERT_EQ(0, WEXITSTATUS(signo));

  } else {

    ASSERT_FALSE(WIFEXITED(status));

debuggerd/seccomp_policy/crash_dump.arm64.policy

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ tgkill: 1 
rt_sigprocmask: 1

rt_sigaction: 1

rt_tgsigqueueinfo: 1

prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41

prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41 || arg0 == PR_PAC_RESET_KEYS

madvise: 1

mprotect: arg2 in 0x1|0x2

munmap: 1

debuggerd/seccomp_policy/crash_dump.policy.def

+5 −0
Original line number Diff line number Diff line
@@ -34,7 +34,12 @@ rt_sigaction: 1 
rt_tgsigqueueinfo: 1



#define PR_SET_VMA 0x53564d41

#if defined(__aarch64__)

// PR_PAC_RESET_KEYS happens on aarch64 in pthread_create path.

prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == PR_SET_VMA || arg0 == PR_PAC_RESET_KEYS

#else

prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == PR_SET_VMA

#endif



#if 0

libminijail on vendor partitions older than P does not have constants from <sys/mman.h>.