ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Allow another prctl call."

Browse source
This commit is contained in:
Christopher Ferris 2021-04-20 16:38:48 +00:00 • committed by Gerrit Code Review
commit 8711f72835
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debuggerd/debuggerd_test.cpp
View file

@ -274,7 +274,7 @@ void CrasherTest::AssertDeath(int signo) {
} }
if (signo == 0) { if (signo == 0) {
ASSERT_TRUE(WIFEXITED(status)); ASSERT_TRUE(WIFEXITED(status)) << "Terminated due to unexpected signal " << WTERMSIG(status);
ASSERT_EQ(0, WEXITSTATUS(signo)); ASSERT_EQ(0, WEXITSTATUS(signo));
} else { } else {
ASSERT_FALSE(WIFEXITED(status)); ASSERT_FALSE(WIFEXITED(status));

2
debuggerd/seccomp_policy/crash_dump.arm64.policy
View file

@ -24,7 +24,7 @@ tgkill: 1
rt_sigprocmask: 1 rt_sigprocmask: 1
rt_sigaction: 1 rt_sigaction: 1
rt_tgsigqueueinfo: 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 madvise: 1
mprotect: arg2 in 0x1|0x2 mprotect: arg2 in 0x1|0x2
munmap: 1 munmap: 1

5
debuggerd/seccomp_policy/crash_dump.policy.def
View file

@ -34,7 +34,12 @@ rt_sigaction: 1
rt_tgsigqueueinfo: 1 rt_tgsigqueueinfo: 1
#define PR_SET_VMA 0x53564d41 #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 prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == PR_SET_VMA
#endif
#if 0 #if 0
libminijail on vendor partitions older than P does not have constants from <sys/mman.h>. libminijail on vendor partitions older than P does not have constants from <sys/mman.h>.