tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Symbolic constants for older minijails" am: 76bb5f1c6e

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

Change-Id: I9a9246795472a0576839f69e57aa9f69056db8b7
This commit is contained in:
Treehugger Robot 2022-03-22 02:04:50 +00:00 committed by Automerger Merge Worker
commit 2ad56d8cc0
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@ tgkill: 1
rt_sigprocmask: 1
rt_sigaction: 1
rt_tgsigqueueinfo: 1
prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41 || arg0 == PR_PAC_RESET_KEYS || arg0 == PR_GET_TAGGED_ADDR_CTRL || arg0 == PR_PAC_GET_ENABLED_KEYS
prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41 || arg0 == PR_PAC_RESET_KEYS || arg0 == 56 || arg0 == 61
madvise: 1
mprotect: arg2 in 0x1|0x2
munmap: 1

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

@ -34,7 +34,15 @@ rt_sigprocmask: 1
rt_sigaction: 1
rt_tgsigqueueinfo: 1
// this is referenced from mainline modules running on Q devices, where not all
// of the constants used here are defined in headers, so minijail rejects them.
// we define them here to avoid those errors.
// constants introduced in R
#define PR_SET_VMA 0x53564d41
#define PR_GET_TAGGED_ADDR_CTRL 56
// constants introduced in S
#define PR_PAC_GET_ENABLED_KEYS 61
#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 || arg0 == PR_GET_TAGGED_ADDR_CTRL || arg0 == PR_PAC_GET_ENABLED_KEYS