From b31ec34eef557f53762cc433d01920ad1f2ccf3f Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 29 Jul 2021 21:24:38 +0800 Subject: [PATCH] Move vendor_sched to common sepolicy Previously vendor_sched is put under product area which will be replaced by GSI. To solve it, move it to system/sepolicy. Bug: 194656257 Test: build pass Change-Id: Ia0b855e3a876a58b58f79b4fba09293419797b47 --- private/compat/31.0/31.0.ignore.cil | 2 ++ private/genfs_contexts | 2 ++ public/file.te | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/private/compat/31.0/31.0.ignore.cil b/private/compat/31.0/31.0.ignore.cil index 06859d9f0..87b09b15e 100644 --- a/private/compat/31.0/31.0.ignore.cil +++ b/private/compat/31.0/31.0.ignore.cil @@ -16,4 +16,6 @@ transformer_service proc_watermark_boost_factor untrusted_app_30 + proc_vendor_sched + sysfs_vendor_sched )) diff --git a/private/genfs_contexts b/private/genfs_contexts index b890ba619..8af6198fb 100644 --- a/private/genfs_contexts +++ b/private/genfs_contexts @@ -104,6 +104,7 @@ genfscon proc /version u:object_r:proc_version:s0 genfscon proc /vmallocinfo u:object_r:proc_vmallocinfo:s0 genfscon proc /vmstat u:object_r:proc_vmstat:s0 genfscon proc /zoneinfo u:object_r:proc_zoneinfo:s0 +genfscon proc /vendor_sched u:object_r:proc_vendor_sched:s0 genfscon fusectl / u:object_r:fusectlfs:s0 @@ -165,6 +166,7 @@ genfscon sysfs /module/tcp_cubic/parameters u:object_r:sysfs_net:s0 genfscon sysfs /module/wlan/parameters/fwpath u:object_r:sysfs_wlan_fwpath:s0 genfscon sysfs /devices/virtual/timed_output/vibrator/enable u:object_r:sysfs_vibrator:s0 genfscon sysfs /devices/virtual/misc/uhid u:object_r:sysfs_uhid:s0 +genfscon sysfs /kernel/vendor_sched u:object_r:sysfs_vendor_sched:s0 genfscon debugfs /kprobes u:object_r:debugfs_kprobes:s0 genfscon debugfs /mmc0 u:object_r:debugfs_mmc:s0 diff --git a/public/file.te b/public/file.te index 2d98bb0dd..9bb1ff960 100644 --- a/public/file.te +++ b/public/file.te @@ -78,6 +78,7 @@ type proc_version, fs_type, proc_type; type proc_vmallocinfo, fs_type, proc_type; type proc_vmstat, fs_type, proc_type; type proc_zoneinfo, fs_type, proc_type; +type proc_vendor_sched, proc_type, fs_type; type selinuxfs, fs_type, mlstrustedobject; type fusectlfs, fs_type; type cgroup, fs_type, mlstrustedobject; @@ -117,6 +118,10 @@ type sysfs_fs_ext4_features, sysfs_type, fs_type; type sysfs_fs_f2fs, sysfs_type, fs_type; type sysfs_fs_incfs_features, sysfs_type, fs_type; type sysfs_fs_incfs_metrics, sysfs_type, fs_type; +type sysfs_vendor_sched, sysfs_type, fs_type; +userdebug_or_eng(` + typeattribute sysfs_vendor_sched mlstrustedobject; +') type fs_bpf, fs_type; type fs_bpf_tethering, fs_type; type configfs, fs_type;