diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-24 23:08:52 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-24 23:08:52 +0000 |
| commit | 9bab32838e059b8006686772e2d0ac80bbff82c3 (patch) | |
| tree | 612b2732a401f0e3045857a514080593c3ec1b81 | |
| parent | 1d37c4499249b17f143df12cebc5ee9ea3600ce3 (diff) | |
| parent | da8ec2cca9fd193d91572f0ac88b631da22c9b74 (diff) | |
| download | core-android12-s4-release.tar.gz | |
Merge cherrypicks of [15981479, 15981480, 15981481] into sparse-7698606-L38200000952402237.android-12.0.0_r33android-12.0.0_r30android12-s4-release
Change-Id: I2f75fc7924a3335a858b41f19c0413b0848de4cf
| -rw-r--r-- | init/init.cpp | 15 | ||||
| -rw-r--r-- | rootdir/init.rc | 16 |
2 files changed, 30 insertions, 1 deletions
diff --git a/init/init.cpp b/init/init.cpp index a7325cad9..942feb939 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -27,6 +27,7 @@ #include <sys/mount.h> #include <sys/signalfd.h> #include <sys/types.h> +#include <sys/utsname.h> #include <unistd.h> #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ @@ -554,6 +555,19 @@ static void SetUsbController() { } } +/// Set ro.kernel.version property to contain the major.minor pair as returned +/// by uname(2). +static void SetKernelVersion() { + struct utsname uts; + unsigned int major, minor; + + if ((uname(&uts) != 0) || (sscanf(uts.release, "%u.%u", &major, &minor) != 2)) { + LOG(ERROR) << "Could not parse the kernel version from uname"; + return; + } + SetProperty("ro.kernel.version", android::base::StringPrintf("%u.%u", major, minor)); +} + static void HandleSigtermSignal(const signalfd_siginfo& siginfo) { if (siginfo.ssi_pid != 0) { // Drop any userspace SIGTERM requests. @@ -824,6 +838,7 @@ int SecondStageMain(int argc, char** argv) { export_oem_lock_status(); MountHandler mount_handler(&epoll); SetUsbController(); + SetKernelVersion(); const BuiltinFunctionMap& function_map = GetBuiltinFunctionMap(); Action::set_function_map(&function_map); diff --git a/rootdir/init.rc b/rootdir/init.rc index 376a678a8..451595092 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -590,9 +590,23 @@ on late-fs # Load trusted keys from dm-verity protected partitions exec -- /system/bin/fsverity_init --load-verified-keys +# Only enable the bootreceiver tracing instance for kernels 5.10 and above. +on late-fs && property:ro.kernel.version=4.9 + setprop bootreceiver.enable 0 +on late-fs && property:ro.kernel.version=4.14 + setprop bootreceiver.enable 0 +on late-fs && property:ro.kernel.version=4.19 + setprop bootreceiver.enable 0 +on late-fs && property:ro.kernel.version=5.4 + setprop bootreceiver.enable 0 +on late-fs + # Bootreceiver tracing instance is enabled by default. + setprop bootreceiver.enable ${bootreceiver.enable:-1} + +on property:ro.product.cpu.abilist64=* && property:bootreceiver.enable=1 # Set up a tracing instance for system_server to monitor error_report_end events. # These are sent by kernel tools like KASAN and KFENCE when a memory corruption - # is detected. + # is detected. This is only needed for 64-bit systems. mkdir /sys/kernel/tracing/instances/bootreceiver 0700 system system restorecon_recursive /sys/kernel/tracing/instances/bootreceiver write /sys/kernel/tracing/instances/bootreceiver/buffer_size_kb 1 |