commit 0d6acf5668789bb261d346d958faa75c54cad31a
author Josh Gao <jmgao@google.com> Wed Jan 25 21:30:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 21:30:09 2017 +0000
tree effecd8c5fb937a08ca79249c0f4f7b0e1d083b0
parent 6bac259f9e0ca285be2f424b1f02f798cd841e14
parent fa1e17f067a15e155799287cd936ed09c3948f6d

Merge "Give crash_dump CAP_SYS_PTRACE." am: 9e60a54f67 am: a417d90e36
am: 55cb039f55

Change-Id: Ibc8cec120a3d70776554364bd46f94349da6c0b0

libcutils/fs_config.c

diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c
index b701bba..013999a 100644
--- a/libcutils/fs_config.c
+++ b/libcutils/fs_config.c
@@ -177,8 +177,11 @@
                                            CAP_MASK_LONG(CAP_SETPCAP),
                                               "system/bin/webview_zygote64" },
 
-    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump32" },
-    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump64" },
+    { 00755, AID_ROOT,      AID_SHELL,     CAP_MASK_LONG(CAP_SYS_PTRACE),
+                                              "system/bin/crash_dump32" },
+    { 00755, AID_ROOT,      AID_SHELL,     CAP_MASK_LONG(CAP_SYS_PTRACE),
+                                              "system/bin/crash_dump64" },
+
     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/debuggerd" },
     { 00750, AID_ROOT,      AID_ROOT,      0, "system/bin/uncrypt" },
     { 00750, AID_ROOT,      AID_ROOT,      0, "system/bin/install-recovery.sh" },