diff --git a/private/app_neverallows.te b/private/app_neverallows.te index db14f1b585486f85aa97a47940da6b71c34c3a5b..7638d368fd332ab968653d072866569b7c3dcd16 100644 --- a/private/app_neverallows.te +++ b/private/app_neverallows.te @@ -110,7 +110,7 @@ neverallow all_untrusted_apps anr_data_file:dir ~search; # Create a more specific label if needed neverallow all_untrusted_apps { proc - proc_asound_cards + proc_asound proc_filesystems proc_kmsg proc_loadavg diff --git a/private/compat/26.0/26.0.cil b/private/compat/26.0/26.0.cil index 5a6ad3a5454f7e4b54954ef5e2fcf7e43bc447e3..820507c9073e964c3b8320bae13acda3ca2cec64 100644 --- a/private/compat/26.0/26.0.cil +++ b/private/compat/26.0/26.0.cil @@ -447,7 +447,7 @@ (typeattributeset preopt2cachename_exec_26_0 (preopt2cachename_exec)) (typeattributeset print_service_26_0 (print_service)) (typeattributeset priv_app_26_0 (mediaprovider priv_app)) -(typeattributeset proc_26_0 (proc proc_asound_cards proc_cmdline proc_filesystems proc_kmsg proc_loadavg proc_mounts proc_pagetypeinfo proc_swaps proc_uid_time_in_state proc_version proc_vmallocinfo)) +(typeattributeset proc_26_0 (proc proc_asound proc_cmdline proc_filesystems proc_kmsg proc_loadavg proc_mounts proc_pagetypeinfo proc_swaps proc_uid_time_in_state proc_version proc_vmallocinfo)) (typeattributeset proc_bluetooth_writable_26_0 (proc_bluetooth_writable)) (typeattributeset proc_cpuinfo_26_0 (proc_cpuinfo)) (typeattributeset proc_drop_caches_26_0 (proc_drop_caches)) diff --git a/private/genfs_contexts b/private/genfs_contexts index b5827c80337a5adf6ecbc32bb0a4303c6cc5fe85..6a95ffbdb9d9974462812809fb2367786aaa4386 100644 --- a/private/genfs_contexts +++ b/private/genfs_contexts @@ -2,7 +2,8 @@ genfscon rootfs / u:object_r:rootfs:s0 # proc labeling can be further refined (longest matching prefix). genfscon proc / u:object_r:proc:s0 -genfscon proc /asound/cards u:object_r:proc_asound_cards:s0 +genfscon proc /asound/cards u:object_r:proc_asound:s0 +genfscon proc /asound/devices u:object_r:proc_asound:s0 genfscon proc /cmdline u:object_r:proc_cmdline:s0 genfscon proc /config.gz u:object_r:config_gz:s0 genfscon proc /filesystems u:object_r:proc_filesystems:s0 diff --git a/private/system_server.te b/private/system_server.te index 54efa20d581895dca65132b0218c271f2a516188..2478ee9334735450f159687ac01149db771f57ba 100644 --- a/private/system_server.te +++ b/private/system_server.te @@ -675,7 +675,7 @@ allow system_server preloads_media_file:dir { r_dir_perms write remove_name rmdi r_dir_file(system_server, cgroup) allow system_server ion_device:chr_file r_file_perms; -r_dir_file(system_server, proc_asound_cards) +r_dir_file(system_server, proc_asound) r_dir_file(system_server, proc_loadavg) r_dir_file(system_server, proc_meminfo) r_dir_file(system_server, proc_net) diff --git a/public/file.te b/public/file.te index 840fd2eebea0ff03f3f82d8b0f96bfd870763318..f978edc4ce2ecca6f670c6402f60b0941054e306 100644 --- a/public/file.te +++ b/public/file.te @@ -13,7 +13,7 @@ type usermodehelper, fs_type; type sysfs_usermodehelper, fs_type, sysfs_type; type qtaguid_proc, fs_type, mlstrustedobject; type proc_bluetooth_writable, fs_type; -type proc_asound_cards, fs_type; +type proc_asound, fs_type; type proc_cmdline, fs_type; type proc_cpuinfo, fs_type; type proc_filesystems, fs_type; diff --git a/public/hal_audio.te b/public/hal_audio.te index be7e23550abac0a1eb68fcbdf83d9427d8958f7d..6a436bd8e0edb4fa169d7c41578efa92d9c095a7 100644 --- a/public/hal_audio.te +++ b/public/hal_audio.te @@ -14,7 +14,7 @@ userdebug_or_eng(` ') r_dir_file(hal_audio, proc) -r_dir_file(hal_audio, proc_asound_cards) +r_dir_file(hal_audio, proc_asound) allow hal_audio audio_device:dir r_dir_perms; allow hal_audio audio_device:chr_file rw_file_perms;