commit de4eb21cc3632dcecfc4ae09a31eea35d0011a14
author Jeffrey Vander Stoep <jeffv@google.com> Wed Jun 01 23:18:45 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 01 23:18:45 2016 +0000
tree 479d2139b41bc628c3e3b51d24484cd583fb09cf
parent 416bf6a2cda35bc11206c2bc28309dc902a6b9f4
parent 96649d3caf77ce5f8878489a68bfabb85ee1a5f6

Merge "add a property for controlling perf_event_paranoid"

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index ef70bf2..a359713 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -571,6 +571,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.
 ##