diff options
author | Justin Yun | 2018-02-18 19:42:42 -0600 |
---|---|---|
committer | Justin Yun | 2018-02-18 19:42:42 -0600 |
commit | 40ecb9abf2b02f5d1fe571719c566457c56d7cfe (patch) | |
tree | 31660d1f3584eae301c1957f7f18ad3abb72d7b2 /debuggerd | |
parent | 277a95bfef00baffbe66fef10e3828d827e16641 (diff) | |
download | platform-system-core-40ecb9abf2b02f5d1fe571719c566457c56d7cfe.tar.gz platform-system-core-40ecb9abf2b02f5d1fe571719c566457c56d7cfe.tar.xz platform-system-core-40ecb9abf2b02f5d1fe571719c566457c56d7cfe.zip |
Define PROT_READ and PROT_WRITE when generating the policy files
When generating crash_dump.*.policy, replace PROT_READ and PROT_WRITE
to numeric constants to make the policy backward compatible with old
libminijail.so.
Bug: 73273658
Test: use the new policy in OMR1 devices
Change-Id: I936a733340ad4df8aef6562c03eb10c29ffdada2
Diffstat (limited to 'debuggerd')
-rw-r--r-- | debuggerd/seccomp_policy/crash_dump.arm.policy | 4 | ||||
-rw-r--r-- | debuggerd/seccomp_policy/crash_dump.arm64.policy | 4 | ||||
-rw-r--r-- | debuggerd/seccomp_policy/crash_dump.policy.def | 2 | ||||
-rw-r--r-- | debuggerd/seccomp_policy/crash_dump.x86.policy | 4 | ||||
-rw-r--r-- | debuggerd/seccomp_policy/crash_dump.x86_64.policy | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/debuggerd/seccomp_policy/crash_dump.arm.policy b/debuggerd/seccomp_policy/crash_dump.arm.policy index b1f459da8..254330d51 100644 --- a/debuggerd/seccomp_policy/crash_dump.arm.policy +++ b/debuggerd/seccomp_policy/crash_dump.arm.policy | |||
@@ -26,11 +26,11 @@ rt_sigaction: 1 | |||
26 | rt_tgsigqueueinfo: 1 | 26 | rt_tgsigqueueinfo: 1 |
27 | prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41 | 27 | prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41 |
28 | madvise: 1 | 28 | madvise: 1 |
29 | mprotect: arg2 in PROT_READ|PROT_WRITE | 29 | mprotect: arg2 in 0x1|0x2 |
30 | munmap: 1 | 30 | munmap: 1 |
31 | getuid32: 1 | 31 | getuid32: 1 |
32 | fstat64: 1 | 32 | fstat64: 1 |
33 | mmap2: arg2 in PROT_READ|PROT_WRITE | 33 | mmap2: arg2 in 0x1|0x2 |
34 | geteuid32: 1 | 34 | geteuid32: 1 |
35 | getgid32: 1 | 35 | getgid32: 1 |
36 | getegid32: 1 | 36 | getegid32: 1 |
diff --git a/debuggerd/seccomp_policy/crash_dump.arm64.policy b/debuggerd/seccomp_policy/crash_dump.arm64.policy index e5e7afb2c..9b3ef09ef 100644 --- a/debuggerd/seccomp_policy/crash_dump.arm64.policy +++ b/debuggerd/seccomp_policy/crash_dump.arm64.policy | |||
@@ -25,11 +25,11 @@ rt_sigaction: 1 | |||
25 | rt_tgsigqueueinfo: 1 | 25 | rt_tgsigqueueinfo: 1 |
26 | prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41 | 26 | prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41 |
27 | madvise: 1 | 27 | madvise: 1 |
28 | mprotect: arg2 in PROT_READ|PROT_WRITE | 28 | mprotect: arg2 in 0x1|0x2 |
29 | munmap: 1 | 29 | munmap: 1 |
30 | getuid: 1 | 30 | getuid: 1 |
31 | fstat: 1 | 31 | fstat: 1 |
32 | mmap: arg2 in PROT_READ|PROT_WRITE | 32 | mmap: arg2 in 0x1|0x2 |
33 | geteuid: 1 | 33 | geteuid: 1 |
34 | getgid: 1 | 34 | getgid: 1 |
35 | getegid: 1 | 35 | getegid: 1 |
diff --git a/debuggerd/seccomp_policy/crash_dump.policy.def b/debuggerd/seccomp_policy/crash_dump.policy.def index b78c94a2b..9190ed749 100644 --- a/debuggerd/seccomp_policy/crash_dump.policy.def +++ b/debuggerd/seccomp_policy/crash_dump.policy.def | |||
@@ -33,6 +33,8 @@ rt_sigaction: 1 | |||
33 | rt_tgsigqueueinfo: 1 | 33 | rt_tgsigqueueinfo: 1 |
34 | 34 | ||
35 | #define PR_SET_VMA 0x53564d41 | 35 | #define PR_SET_VMA 0x53564d41 |
36 | #define PROT_READ 0x1 | ||
37 | #define PROT_WRITE 0x2 | ||
36 | prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == PR_SET_VMA | 38 | prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == PR_SET_VMA |
37 | 39 | ||
38 | madvise: 1 | 40 | madvise: 1 |
diff --git a/debuggerd/seccomp_policy/crash_dump.x86.policy b/debuggerd/seccomp_policy/crash_dump.x86.policy index b1f459da8..254330d51 100644 --- a/debuggerd/seccomp_policy/crash_dump.x86.policy +++ b/debuggerd/seccomp_policy/crash_dump.x86.policy | |||
@@ -26,11 +26,11 @@ rt_sigaction: 1 | |||
26 | rt_tgsigqueueinfo: 1 | 26 | rt_tgsigqueueinfo: 1 |
27 | prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41 | 27 | prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41 |
28 | madvise: 1 | 28 | madvise: 1 |
29 | mprotect: arg2 in PROT_READ|PROT_WRITE | 29 | mprotect: arg2 in 0x1|0x2 |
30 | munmap: 1 | 30 | munmap: 1 |
31 | getuid32: 1 | 31 | getuid32: 1 |
32 | fstat64: 1 | 32 | fstat64: 1 |
33 | mmap2: arg2 in PROT_READ|PROT_WRITE | 33 | mmap2: arg2 in 0x1|0x2 |
34 | geteuid32: 1 | 34 | geteuid32: 1 |
35 | getgid32: 1 | 35 | getgid32: 1 |
36 | getegid32: 1 | 36 | getegid32: 1 |
diff --git a/debuggerd/seccomp_policy/crash_dump.x86_64.policy b/debuggerd/seccomp_policy/crash_dump.x86_64.policy index e5e7afb2c..9b3ef09ef 100644 --- a/debuggerd/seccomp_policy/crash_dump.x86_64.policy +++ b/debuggerd/seccomp_policy/crash_dump.x86_64.policy | |||
@@ -25,11 +25,11 @@ rt_sigaction: 1 | |||
25 | rt_tgsigqueueinfo: 1 | 25 | rt_tgsigqueueinfo: 1 |
26 | prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41 | 26 | prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41 |
27 | madvise: 1 | 27 | madvise: 1 |
28 | mprotect: arg2 in PROT_READ|PROT_WRITE | 28 | mprotect: arg2 in 0x1|0x2 |
29 | munmap: 1 | 29 | munmap: 1 |
30 | getuid: 1 | 30 | getuid: 1 |
31 | fstat: 1 | 31 | fstat: 1 |
32 | mmap: arg2 in PROT_READ|PROT_WRITE | 32 | mmap: arg2 in 0x1|0x2 |
33 | geteuid: 1 | 33 | geteuid: 1 |
34 | getgid: 1 | 34 | getgid: 1 |
35 | getegid: 1 | 35 | getegid: 1 |