commit 17e6df25d2f3f3de996f7ea7c5bf9b448235a064
author Josh Gao <jmgao@google.com> Wed Jan 25 21:40:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 21:40:08 2017 +0000
tree af1b244de93afc0d9a4ff3b869c39566ad91ae6e
parent 3cb133703a2dfc0d6b645cdc67195569e4ae473c
parent e5c8e7ddaf77a2389f35724b9aa42e9e4d0a8103

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

Change-Id: I66c1b0751eada4047e5ce6a19634bc3912924280

libcutils/fs_config.c

diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c
index a7c2dce..3d686ce 100644
--- a/libcutils/fs_config.c
+++ b/libcutils/fs_config.c
@@ -182,8 +182,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" },