Merge "Allow another prctl call."
This commit is contained in:
commit
8711f72835
3 changed files with 7 additions and 2 deletions
|
@ -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));
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>.
|
||||
|
|
Loading…
Reference in a new issue