openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Use property ro.product.enforce_debugfs_restrictions to enable debugfs restrictions" am: 2a8b028c04 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1663702

Change-Id: I263560301661de35986a3813eb938c5fe3c2c71e
This commit is contained in:
Hridya Valsaraju 2021-04-12 17:40:43 +00:00 committed by Automerger Merge Worker
parent 20df86b2e3 2a8b028c04
commit bdc512a21b
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
init/init.cpp
View File

@ -849,21 +849,6 @@ int SecondStageMain(int argc, char** argv) {
auto is_installed = android::gsi::IsGsiInstalled() ? "1" : "0";
SetProperty(gsi::kGsiInstalledProp, is_installed);
/*
* For debug builds of S launching devices, init mounts debugfs for
* enabling vendor debug data collection setup at boot time. Init will unmount it on
* boot-complete after vendor code has performed the required initializations
* during boot. Dumpstate will then mount debugfs in order to read data
* from the same using the dumpstate HAL during bugreport creation.
* Dumpstate will also unmount debugfs after bugreport creation.
* first_api_level comparison is done here instead
* of init.rc since init.rc parser does not support >/< operators.
*/
auto api_level = android::base::GetIntProperty("ro.product.first_api_level", 0);
bool is_debuggable = android::base::GetBoolProperty("ro.debuggable", false);
auto mount_debugfs = (is_debuggable && (api_level >= 31)) ? "1" : "0";
SetProperty("init.mount_debugfs", mount_debugfs);
am.QueueBuiltinAction(SetupCgroupsAction, "SetupCgroups");
am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict");
am.QueueBuiltinAction(TestPerfEventSelinuxAction, "TestPerfEventSelinux");

4
rootdir/init.rc
View File

@ -985,7 +985,7 @@ on boot && property:ro.config.low_ram=true
write /proc/sys/vm/dirty_expire_centisecs 200
write /proc/sys/vm/dirty_background_ratio 5
on property:sys.boot_completed=1 && property:init.mount_debugfs=1
on property:sys.boot_completed=1 && property:ro.product.enforce_debugfs_restrictions=true
umount /sys/kernel/debug
on boot
@ -1263,7 +1263,7 @@ on userspace-reboot-resume
on property:sys.boot_completed=1 && property:sys.init.userspace_reboot.in_progress=1
setprop sys.init.userspace_reboot.in_progress ""
on early-init && property:init.mount_debugfs=1
on early-init && property:ro.product.enforce_debugfs_restrictions=true
mount debugfs debugfs /sys/kernel/debug
chmod 0755 /sys/kernel/debug