From 7cc2a53c22cec39b963b13394ec8b5dd03815af2 Mon Sep 17 00:00:00 2001 From: Tri Vo <trong@google.com> Date: Wed, 31 Jan 2018 17:15:13 -0800 Subject: [PATCH] Add missing types to 27.0[.ignore].cil. Bug: 69390067 Test: build sepolicy Test: 27.0.ignore.cil is a subset 26.0.ignore.cil Change-Id: I6b9a1cfa8b38df4e97e5d63e2938ee9d5a4c83ec --- private/compat/27.0/27.0.cil | 58 +++++++++++++++-- private/compat/27.0/27.0.ignore.cil | 97 +++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 5 deletions(-) create mode 100644 private/compat/27.0/27.0.ignore.cil diff --git a/private/compat/27.0/27.0.cil b/private/compat/27.0/27.0.cil index eea2f6b48..06f4c9122 100644 --- a/private/compat/27.0/27.0.cil +++ b/private/compat/27.0/27.0.cil @@ -827,7 +827,9 @@ (typeattributeset dalvikcache_data_file_27_0 (dalvikcache_data_file)) (typeattributeset dalvik_prop_27_0 (dalvik_prop)) (typeattributeset dbinfo_service_27_0 (dbinfo_service)) -(typeattributeset debugfs_27_0 (debugfs)) +(typeattributeset debugfs_27_0 + ( debugfs + debugfs_wakeup_sources)) (typeattributeset debugfs_mmc_27_0 (debugfs_mmc)) (typeattributeset debugfs_trace_marker_27_0 (debugfs_trace_marker)) (typeattributeset debugfs_tracing_27_0 (debugfs_tracing)) @@ -839,7 +841,9 @@ (typeattributeset default_android_hwservice_27_0 (default_android_hwservice)) (typeattributeset default_android_service_27_0 (default_android_service)) (typeattributeset default_android_vndservice_27_0 (default_android_vndservice)) -(typeattributeset default_prop_27_0 (default_prop)) +(typeattributeset default_prop_27_0 + ( default_prop + pm_prop)) (typeattributeset device_27_0 (device)) (typeattributeset device_identifiers_service_27_0 (device_identifiers_service)) (typeattributeset deviceidle_service_27_0 (deviceidle_service)) @@ -1162,7 +1166,38 @@ (typeattributeset preopt2cachename_exec_27_0 (preopt2cachename_exec)) (typeattributeset print_service_27_0 (print_service)) (typeattributeset priv_app_27_0 (priv_app)) -(typeattributeset proc_27_0 (proc)) +(typeattributeset proc_27_0 + ( proc + proc_abi + proc_asound + proc_buddyinfo + proc_cmdline + proc_dirty + proc_diskstats + proc_extra_free_kbytes + proc_filesystems + proc_hostname + proc_hung_task + proc_kmsg + proc_loadavg + proc_max_map_count + proc_min_free_order_shift + proc_mounts + proc_page_cluster + proc_pagetypeinfo + proc_panic + proc_pid_max + proc_pipe_conf + proc_random + proc_sched + proc_swaps + proc_uid_concurrent_active_time + proc_uid_concurrent_policy_time + proc_uid_cpupower + proc_uptime + proc_version + proc_vmallocinfo + proc_vmstat)) (typeattributeset proc_bluetooth_writable_27_0 (proc_bluetooth_writable)) (typeattributeset proc_cpuinfo_27_0 (proc_cpuinfo)) (typeattributeset proc_drop_caches_27_0 (proc_drop_caches)) @@ -1172,7 +1207,9 @@ (typeattributeset proc_meminfo_27_0 (proc_meminfo)) (typeattributeset proc_misc_27_0 (proc_misc)) (typeattributeset proc_modules_27_0 (proc_modules)) -(typeattributeset proc_net_27_0 (proc_net)) +(typeattributeset proc_net_27_0 + ( proc_net + proc_qtaguid_stat)) (typeattributeset proc_overcommit_memory_27_0 (proc_overcommit_memory)) (typeattributeset proc_perf_27_0 (proc_perf)) (typeattributeset proc_security_27_0 (proc_security)) @@ -1280,7 +1317,18 @@ (typeattributeset surfaceflinger_27_0 (surfaceflinger)) (typeattributeset surfaceflinger_service_27_0 (surfaceflinger_service)) (typeattributeset swap_block_device_27_0 (swap_block_device)) -(typeattributeset sysfs_27_0 (sysfs)) +(typeattributeset sysfs_27_0 + ( sysfs + sysfs_android_usb + sysfs_dm + sysfs_dt_firmware_android + sysfs_ipv4 + sysfs_kernel_notes + sysfs_net + sysfs_power + sysfs_rtc + sysfs_switch + sysfs_wakeup_reasons)) (typeattributeset sysfs_batteryinfo_27_0 (sysfs_batteryinfo)) (typeattributeset sysfs_bluetooth_writable_27_0 (sysfs_bluetooth_writable)) (typeattributeset sysfs_devices_system_cpu_27_0 (sysfs_devices_system_cpu)) diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil new file mode 100644 index 000000000..99db6624e --- /dev/null +++ b/private/compat/27.0/27.0.ignore.cil @@ -0,0 +1,97 @@ +;; new_objects - a collection of types that have been introduced that have no +;; analogue in older policy. Thus, we do not need to map these types to +;; previous ones. Add here to pass checkapi tests. +(typeattribute new_objects) +(typeattributeset new_objects + ( blank_screen + blank_screen_exec + blank_screen_tmpfs + bootloader_boot_reason_prop + bpfloader + bpfloader_exec + cgroup_bpf + crossprofileapps_service + exported2_config_prop + exported2_default_prop + exported2_radio_prop + exported2_system_prop + exported2_vold_prop + exported3_default_prop + exported3_system_prop + exported_config_prop + exported_dalvik_prop + exported_default_prop + exported_dumpstate_prop + exported_ffs_prop + exported_fingerprint_prop + exported_overlay_prop + exported_pm_prop + exported_radio_prop + exported_system_prop + exported_system_radio_prop + exported_vold_prop + fs_bpf + hal_authsecret_hwservice + hal_confirmationui_hwservice + hal_lowpan_hwservice + hal_secure_element_hwservice + hal_usb_gadget_hwservice + incident_helper + incident_helper_exec + last_boot_reason_prop + lowpan_device + lowpan_prop + lowpan_service + mediaextractor_update_service + network_watchlist_data_file + network_watchlist_service + perfetto + perfetto_exec + perfetto_tmpfs + perfetto_traces_data_file + perfprofd_service + property_info + secure_element + secure_element_service + secure_element_tmpfs + slice_service + stats + stats_data_file + stats_exec + stats_service + statscompanion_service + statsd + statsd_exec + statsd_tmpfs + storaged_data_file + system_boot_reason_prop + system_update_service + tombstone_wifi_data_file + trace_data_file + traced + traced_consumer_socket + traced_exec + traced_probes + traced_probes_exec + traced_probes_tmpfs + traced_producer_socket + traced_tmpfs + traceur_app + traceur_app_tmpfs + update_engine_log_data_file + usbd + usbd_exec + usbd_tmpfs + vendor_default_prop + vendor_init + vendor_shell + vold_metadata_file + vold_prepare_subdirs + vold_prepare_subdirs_exec + vold_service + wm_trace_data_file + wpantund + wpantund_exec + wpantund_service + wpantund_tmpfs)) + -- GitLab