Skip to content
Snippets Groups Projects
Commit 76aab82c authored by Jeff Vander Stoep's avatar Jeff Vander Stoep
Browse files

Move domain_deprecated into private policy

This attribute is being actively removed from policy. Since
attributes are not being versioned, partners must not be able to
access and use this attribute. Move it from private and verify in
the logs that rild and tee are not using these permissions.

Bug: 38316109
Test: build and boot Marlin
Test: Verify that rild and tee are not being granted any of these
      permissions.
Change-Id: I31beeb5bdf3885195310b086c1af3432dc6a349b
parent 2dd9ae33
No related branches found
No related tags found
No related merge requests found
typeattribute ueventd coredomain; typeattribute ueventd coredomain;
typeattribute ueventd domain_deprecated;
tmpfs_domain(ueventd) tmpfs_domain(ueventd)
typeattribute uncrypt coredomain; typeattribute uncrypt coredomain;
typeattribute uncrypt domain_deprecated;
init_daemon_domain(uncrypt) init_daemon_domain(uncrypt)
typeattribute update_engine coredomain; typeattribute update_engine coredomain;
typeattribute update_engine domain_deprecated;
init_daemon_domain(update_engine); init_daemon_domain(update_engine);
typeattribute vold coredomain; typeattribute vold coredomain;
typeattribute vold domain_deprecated;
init_daemon_domain(vold) init_daemon_domain(vold)
......
...@@ -10,16 +10,6 @@ attribute dev_type; ...@@ -10,16 +10,6 @@ attribute dev_type;
# All types used for processes. # All types used for processes.
attribute domain; attribute domain;
# Temporary attribute used for migrating permissions out of domain.
# Motivation: Domain is overly permissive. Start removing permissions
# from domain and assign them to the domain_deprecated attribute.
# Domain_deprecated and domain can initially be assigned to all
# domains. The goal is to not assign domain_deprecated to new domains
# and to start removing domain_deprecated where it's not required or
# reassigning the appropriate permissions to the inheriting domain
# when necessary.
attribute domain_deprecated;
# All types used for filesystems. # All types used for filesystems.
# On change, update CHECK_FC_ASSERT_ATTRS # On change, update CHECK_FC_ASSERT_ATTRS
# definition in tools/checkfc.c. # definition in tools/checkfc.c.
......
# 464xlat daemon # 464xlat daemon
type clatd, domain, domain_deprecated; type clatd, domain;
type clatd_exec, exec_type, file_type; type clatd_exec, exec_type, file_type;
net_domain(clatd) net_domain(clatd)
......
# dex2oat # dex2oat
type dex2oat, domain, domain_deprecated; type dex2oat, domain;
type dex2oat_exec, exec_type, file_type; type dex2oat_exec, exec_type, file_type;
r_dir_file(dex2oat, apk_data_file) r_dir_file(dex2oat, apk_data_file)
......
type dhcp, domain, domain_deprecated; type dhcp, domain;
type dhcp_exec, exec_type, file_type; type dhcp_exec, exec_type, file_type;
net_domain(dhcp) net_domain(dhcp)
......
# dumpstate # dumpstate
type dumpstate, domain, domain_deprecated, mlstrustedsubject; type dumpstate, domain, mlstrustedsubject;
type dumpstate_exec, exec_type, file_type; type dumpstate_exec, exec_type, file_type;
net_domain(dumpstate) net_domain(dumpstate)
......
type fingerprintd, domain, domain_deprecated; type fingerprintd, domain;
type fingerprintd_exec, exec_type, file_type; type fingerprintd_exec, exec_type, file_type;
binder_use(fingerprintd) binder_use(fingerprintd)
......
# Any fsck program run by init # Any fsck program run by init
type fsck, domain, domain_deprecated; type fsck, domain;
type fsck_exec, exec_type, file_type; type fsck_exec, exec_type, file_type;
# /dev/__null__ created by init prior to policy load, # /dev/__null__ created by init prior to policy load,
......
# Any fsck program run on untrusted block devices # Any fsck program run on untrusted block devices
type fsck_untrusted, domain, domain_deprecated; type fsck_untrusted, domain;
# Inherit and use pty created by android_fork_execvp_ext(). # Inherit and use pty created by android_fork_execvp_ext().
allow fsck_untrusted devpts:chr_file { read write ioctl getattr }; allow fsck_untrusted devpts:chr_file { read write ioctl getattr };
......
# installer daemon # installer daemon
type installd, domain, domain_deprecated; type installd, domain;
type installd_exec, exec_type, file_type; type installd_exec, exec_type, file_type;
typeattribute installd mlstrustedsubject; typeattribute installd mlstrustedsubject;
allow installd self:capability { chown dac_override fowner fsetid setgid setuid sys_admin }; allow installd self:capability { chown dac_override fowner fsetid setgid setuid sys_admin };
......
type keystore, domain, domain_deprecated; type keystore, domain;
type keystore_exec, exec_type, file_type; type keystore_exec, exec_type, file_type;
# keystore daemon # keystore daemon
......
# vpn tunneling protocol manager # vpn tunneling protocol manager
type mtp, domain, domain_deprecated; type mtp, domain;
type mtp_exec, exec_type, file_type; type mtp_exec, exec_type, file_type;
net_domain(mtp) net_domain(mtp)
......
# network manager # network manager
type netd, domain, domain_deprecated, mlstrustedsubject; type netd, domain, mlstrustedsubject;
type netd_exec, exec_type, file_type; type netd_exec, exec_type, file_type;
net_domain(netd) net_domain(netd)
......
...@@ -4,7 +4,6 @@ type perfprofd_exec, exec_type, file_type; ...@@ -4,7 +4,6 @@ type perfprofd_exec, exec_type, file_type;
userdebug_or_eng(` userdebug_or_eng(`
typeattribute perfprofd domain_deprecated;
typeattribute perfprofd coredomain; typeattribute perfprofd coredomain;
typeattribute perfprofd mlstrustedsubject; typeattribute perfprofd mlstrustedsubject;
......
# Point to Point Protocol daemon # Point to Point Protocol daemon
type ppp, domain, domain_deprecated; type ppp, domain;
type ppp_device, dev_type; type ppp_device, dev_type;
type ppp_exec, exec_type, file_type; type ppp_exec, exec_type, file_type;
......
# phone subsystem # phone subsystem
type radio, domain, domain_deprecated, mlstrustedsubject; type radio, domain, mlstrustedsubject;
net_domain(radio) net_domain(radio)
bluetooth_domain(radio) bluetooth_domain(radio)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Declare the domain unconditionally so we can always reference it # Declare the domain unconditionally so we can always reference it
# in neverallow rules. # in neverallow rules.
type recovery, domain, domain_deprecated; type recovery, domain;
# But the allow rules are only included in the recovery policy. # But the allow rules are only included in the recovery policy.
# Otherwise recovery is only allowed the domain rules. # Otherwise recovery is only allowed the domain rules.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment