commit 969d93e6ab5bd78219b48b792e227fd2d26fca8c
author Jeffrey Vander Stoep <jeffv@google.com> Thu Jun 02 01:30:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 02 01:30:50 2016 +0000
tree cc362af2bc7bd09f29f3f1a12743e81fb80292a2
parent 8a423d839f2f26548f0a72f4087e4c952408ffaa
parent 886b8dfa12a47ff211631a98d340d8c2f845c090

Merge "add a property for controlling perf_event_paranoid" am: 9292d7dae3 am: a6d6f45037 am: 680b2f3cb6
am: 0e7344f1ca

* commit '0e7344f1cad902133480d5137af2bdae1bf255e4':
  add a property for controlling perf_event_paranoid

Change-Id: Ib4536fb05b7a3842f208e29bb6ace43ec87f1a39

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 63e173b..e96857d 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -597,6 +597,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.
 ##