Add untrusted_app_27

This is a partial cherry pick of commit 6231b4d9
'Enforce per-app data protections for targetSdk 28+'.

Untrusted_app_27 remains unreachable, but it's existence
prevents future merge conflicts.

Bug: 63897054
Test: build/boot aosp_walleye-userdebug
Change-Id: I64b013874fe87b55f47e817a1279e76ecf86b7c0
Merged-In: I64b013874fe87b55f47e817a1279e76ecf86b7c0
(cherry picked from commit 6231b4d9fc)
This commit is contained in:
Jeff Vander Stoep 2018-04-03 11:22:38 -07:00
parent 0d1e52a50f
commit 3aa7ca56fd
11 changed files with 37 additions and 17 deletions

View file

@ -8,6 +8,7 @@ define(`all_untrusted_apps',`{
mediaprovider mediaprovider
untrusted_app untrusted_app
untrusted_app_25 untrusted_app_25
untrusted_app_27
untrusted_app_all untrusted_app_all
untrusted_v2_app untrusted_v2_app
}') }')

View file

@ -681,7 +681,9 @@
(typeattributeset unencrypted_data_file_26_0 (unencrypted_data_file)) (typeattributeset unencrypted_data_file_26_0 (unencrypted_data_file))
(typeattributeset unlabeled_26_0 (unlabeled)) (typeattributeset unlabeled_26_0 (unlabeled))
(typeattributeset untrusted_app_25_26_0 (untrusted_app_25)) (typeattributeset untrusted_app_25_26_0 (untrusted_app_25))
(typeattributeset untrusted_app_26_0 (untrusted_app)) (typeattributeset untrusted_app_26_0
( untrusted_app
untrusted_app_27))
(typeattributeset untrusted_v2_app_26_0 (untrusted_v2_app)) (typeattributeset untrusted_v2_app_26_0 (untrusted_v2_app))
(typeattributeset update_engine_26_0 (update_engine)) (typeattributeset update_engine_26_0 (update_engine))
(typeattributeset update_engine_data_file_26_0 (update_engine_data_file)) (typeattributeset update_engine_data_file_26_0 (update_engine_data_file))

View file

@ -109,6 +109,7 @@
traced_probes_tmpfs traced_probes_tmpfs
traced_producer_socket traced_producer_socket
traced_tmpfs traced_tmpfs
untrusted_app_all_devpts
update_engine_log_data_file update_engine_log_data_file
vendor_default_prop vendor_default_prop
usbd usbd
@ -131,4 +132,6 @@
;; Thus, these types are also not mapped, but recorded for checkapi tests ;; Thus, these types are also not mapped, but recorded for checkapi tests
(typeattribute priv_objects) (typeattribute priv_objects)
(typeattributeset priv_objects (typeattributeset priv_objects
( adbd_tmpfs )) ( adbd_tmpfs
untrusted_app_27_tmpfs
))

View file

@ -1403,7 +1403,9 @@
(typeattributeset unencrypted_data_file_27_0 (unencrypted_data_file)) (typeattributeset unencrypted_data_file_27_0 (unencrypted_data_file))
(typeattributeset unlabeled_27_0 (unlabeled)) (typeattributeset unlabeled_27_0 (unlabeled))
(typeattributeset untrusted_app_25_27_0 (untrusted_app_25)) (typeattributeset untrusted_app_25_27_0 (untrusted_app_25))
(typeattributeset untrusted_app_27_0 (untrusted_app)) (typeattributeset untrusted_app_27_0
( untrusted_app
untrusted_app_27))
(typeattributeset untrusted_v2_app_27_0 (untrusted_v2_app)) (typeattributeset untrusted_v2_app_27_0 (untrusted_v2_app))
(typeattributeset update_engine_27_0 (update_engine)) (typeattributeset update_engine_27_0 (update_engine))
(typeattributeset update_engine_data_file_27_0 (update_engine_data_file)) (typeattributeset update_engine_data_file_27_0 (update_engine_data_file))

View file

@ -84,6 +84,7 @@
traced_tmpfs traced_tmpfs
traceur_app traceur_app
traceur_app_tmpfs traceur_app_tmpfs
untrusted_app_all_devpts
update_engine_log_data_file update_engine_log_data_file
usbd usbd
usbd_exec usbd_exec
@ -101,3 +102,8 @@
wpantund_service wpantund_service
wpantund_tmpfs)) wpantund_tmpfs))
;; private_objects - a collection of types that were labeled differently in
;; older policy, but that should not remain accessible to vendor policy.
;; Thus, these types are also not mapped, but recorded for checkapi tests
(typeattribute priv_objects)
(typeattributeset priv_objects (untrusted_app_27_tmpfs))

View file

@ -53,11 +53,11 @@ mlsconstrain dir_file_class_set { create relabelfrom relabelto }
# Only constrain open, not read/write. # Only constrain open, not read/write.
# Also constrain other forms of manipulation, e.g. chmod/chown, unlink, rename, etc. # Also constrain other forms of manipulation, e.g. chmod/chown, unlink, rename, etc.
# Subject must be equivalent to object unless the subject is trusted. # Subject must dominate object unless the subject is trusted.
mlsconstrain dir { open search setattr rename add_name remove_name reparent rmdir } mlsconstrain dir { open search setattr rename add_name remove_name reparent rmdir }
(t2 != app_data_file or l1 eq l2 or t1 == mlstrustedsubject); (t2 != app_data_file or l1 dom l2 or t1 == mlstrustedsubject);
mlsconstrain { file lnk_file sock_file } { open setattr unlink link rename } mlsconstrain { file lnk_file sock_file } { open setattr unlink link rename }
(t2 != app_data_file or l1 eq l2 or t1 == mlstrustedsubject); (t2 != app_data_file or l1 dom l2 or t1 == mlstrustedsubject);
# #
# Constraints for file types other than app data files. # Constraints for file types other than app data files.

View file

@ -23,7 +23,3 @@ app_domain(untrusted_app)
untrusted_app_domain(untrusted_app) untrusted_app_domain(untrusted_app)
net_domain(untrusted_app) net_domain(untrusted_app)
bluetooth_domain(untrusted_app) bluetooth_domain(untrusted_app)
# Allow the allocation and use of ptys
# Used by: https://play.google.com/store/apps/details?id=jackpal.androidterm
create_pty(untrusted_app)

View file

@ -26,10 +26,6 @@ untrusted_app_domain(untrusted_app_25)
net_domain(untrusted_app_25) net_domain(untrusted_app_25)
bluetooth_domain(untrusted_app_25) bluetooth_domain(untrusted_app_25)
# Allow the allocation and use of ptys
# Used by: https://play.google.com/store/apps/details?id=jackpal.androidterm
create_pty(untrusted_app_25)
# b/34115651 - net.dns* properties read # b/34115651 - net.dns* properties read
# This will go away in a future Android release # This will go away in a future Android release
get_prop(untrusted_app_25, net_dns_prop) get_prop(untrusted_app_25, net_dns_prop)

View file

@ -1,10 +1,14 @@
### ###
### Untrusted apps. ### Untrusted_27.
### ###
### This file defines the rules for untrusted apps running with
### 25 < targetSdkVersion <= 27.
###
### This file defines the rules for untrusted apps.
### Apps are labeled based on mac_permissions.xml (maps signer and ### Apps are labeled based on mac_permissions.xml (maps signer and
### optionally package name to seinfo value) and seapp_contexts (maps UID ### optionally package name to seinfo value) and seapp_contexts (maps UID
### and optionally seinfo value to domain for process and type for data ### and optionally seinfo value to domain for process and type for data
### directory). The untrusted_app domain is the default assignment in ### directory). The untrusted_app_27 domain is the default assignment in
### seapp_contexts for any app with UID between APP_AID (10000) ### seapp_contexts for any app with UID between APP_AID (10000)
### and AID_ISOLATED_START (99000) if the app has no specific seinfo ### and AID_ISOLATED_START (99000) if the app has no specific seinfo
### value as determined from mac_permissions.xml. In current AOSP, this ### value as determined from mac_permissions.xml. In current AOSP, this
@ -16,5 +20,9 @@
### seapp_contexts. ### seapp_contexts.
### ###
type untrusted_app_25, domain; typeattribute untrusted_app_27 coredomain;
app_domain(untrusted_app_27)
untrusted_app_domain(untrusted_app_27)
net_domain(untrusted_app_27)
bluetooth_domain(untrusted_app_27)

View file

@ -133,3 +133,7 @@ dontaudit untrusted_app_all net_dns_prop:file read;
dontaudit untrusted_app_all proc_stat:file read; dontaudit untrusted_app_all proc_stat:file read;
dontaudit untrusted_app_all proc_vmstat:file read; dontaudit untrusted_app_all proc_vmstat:file read;
dontaudit untrusted_app_all proc_uptime:file read; dontaudit untrusted_app_all proc_uptime:file read;
# Allow the allocation and use of ptys
# Used by: https://play.google.com/store/apps/details?id=jackpal.androidterm
create_pty(untrusted_app_all)

View file

@ -17,3 +17,5 @@
### ###
type untrusted_app, domain; type untrusted_app, domain;
type untrusted_app_27, domain;
type untrusted_app_25, domain;