uncrypt: fix OTAs
uncrypt needs to be able to read OTA files in GMS core's home
directory, which is protected with MLS. Mark uncrypt as an
mlstrustedsubject so that it can read the files.
Addresses the following denial (and probably others):
uncrypt : type=1400 audit(0.0:27): avc: denied { getattr } for path="/data/data/com.google.android.gms" dev="mmcblk0p30" ino=81970 scontext=u:r:uncrypt:s0 tcontext=u:object_r:app_data_file:s0:c512,c768 tclass=dir
Remove the auditallow line for uncrypt. Per dd053a9b89
,
the auditallow line was added to confirm that uncrypt was actually
accessing the userdata block device. The access to the userdata block
device is definitely occurring, and auditing it doesn't add any value.
Remove the auditing.
Eliminates the following unnecessary audit lines:
avc: granted { write } for pid=2449 comm="uncrypt" name="mmcblk0p31" dev="tmpfs" ino=10404 scontext=u:r:uncrypt:s0 tcontext=u:object_r:userdata_block_device:s0 tclass=blk_file
avc: granted { write open } for pid=2449 comm="uncrypt" path="/dev/block/mmcblk0p31" dev="tmpfs" ino=10404 scontext=u:r:uncrypt:s0 tcontext=u:object_r:userdata_block_device:s0 tclass=blk_file
Tighten up userdata block access to write-only. uncrypt never reads
directly from the block device.
Testing:
1) Create the file /cache/recovery/command with a line like:
--update_package=/data/data/com.google.android.gms/foo.zip
2) Create the file /data/data/com.google.android.gms/foo.zip
(contents not important)
3) Run "setprop ctl.start pre-recovery"
Expected: No SELinux denials.
Actual: SELinux denials
Bug: 18875451
Change-Id: I62c7f06313afb2535b0de8be3c16d9d33879dd5d
This commit is contained in:
parent
6ae8291048
commit
eb4e2ab15a
1 changed files with 2 additions and 3 deletions
|
@ -1,5 +1,5 @@
|
|||
# uncrypt
|
||||
type uncrypt, domain;
|
||||
type uncrypt, domain, mlstrustedsubject;
|
||||
type uncrypt_exec, exec_type, file_type;
|
||||
|
||||
init_daemon_domain(uncrypt)
|
||||
|
@ -30,5 +30,4 @@ allow uncrypt block_device:blk_file w_file_perms;
|
|||
allow uncrypt block_device:dir r_dir_perms;
|
||||
|
||||
# Access userdata block device.
|
||||
allow uncrypt userdata_block_device:blk_file rw_file_perms;
|
||||
auditallow uncrypt userdata_block_device:blk_file rw_file_perms;
|
||||
allow uncrypt userdata_block_device:blk_file w_file_perms;
|
||||
|
|
Loading…
Reference in a new issue