commit 933beba0fcc168301a3686af0e3375dddc3c400a
author Jeffrey Vander Stoep <jeffv@google.com> Thu Jun 23 21:07:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 23 21:07:34 2016 +0000
tree c63d2bce52654ce082bc3285514185d56b01e5b0
parent 852ac5729921c7b1b318f359e6876bce1cf64bfd
parent 246b41e5e2716a289e3f31155a07b4668d79a284

Merge \\"add a property for controlling perf_event_paranoid\\" into mnc-dev am: 050243df76
am: f11efb251d

Change-Id: I1c641d19b4badfc9fef73d1a11675777f6d653d5

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 70a75bd..004bd6f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -546,6 +546,11 @@
 on property:sys.sysctl.tcp_def_init_rwnd=*
     write /proc/sys/net/ipv4/tcp_default_init_rwnd ${sys.sysctl.tcp_def_init_rwnd}
 
+on property:security.perf_harden=0
+    write /proc/sys/kernel/perf_event_paranoid 1
+
+on property:security.perf_harden=1
+    write /proc/sys/kernel/perf_event_paranoid 3
 
 ## Daemon processes to be run by init.
 ##