aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Anderson <dvander@google.com>2019-05-24 11:39:43 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-24 11:39:43 -0700
commitae5d17da8f82fbc70ee4fc53749c0f0e9aa711a1 (patch)
tree1d38ade0830c16a8f53326f3e34938d3e1210464
parent2cffb81f479bb390f8542a797058fd1c7790b99b (diff)
parente33e2c0719fba0eaec0b5aff129c372556d4977c (diff)
downloadcuttlefish-ae5d17da8f82fbc70ee4fc53749c0f0e9aa711a1.tar.gz
Remove unneeded sepolicy rules.
am: e33e2c0719 Change-Id: Ifaa067ad0c5ad8d2fccd9926cc8d11a8c7a2975e
-rw-r--r--shared/sepolicy/device.te1
-rw-r--r--shared/sepolicy/recovery.te14
2 files changed, 1 insertions, 14 deletions
diff --git a/shared/sepolicy/device.te b/shared/sepolicy/device.te
index 38f0a2f0f..c29c2bf32 100644
--- a/shared/sepolicy/device.te
+++ b/shared/sepolicy/device.te
@@ -5,3 +5,4 @@ type region_e2e_test_device, dev_type;
type region_screen_device, dev_type;
type socket_forward_device, dev_type;
type virtual_serial_device, dev_type;
+typeattribute system_block_device super_block_device_type;
diff --git a/shared/sepolicy/recovery.te b/shared/sepolicy/recovery.te
index e55c18b0a..d72dc6428 100644
--- a/shared/sepolicy/recovery.te
+++ b/shared/sepolicy/recovery.te
@@ -1,17 +1,3 @@
allow recovery gpu_device:chr_file rw_file_perms;
allow recovery appdomain_tmpfs:file r_file_perms;
-
-allow recovery sysfs_dm:dir r_dir_perms;
-allow recovery sysfs_dm:file r_file_perms;
-
-# TODO: This should really be 'super_block_device', but we can't label
-# vda both system_block_device and super_block_device..
-allowxperm recovery system_block_device:blk_file ioctl { BLKIOMIN BLKALIGNOFF };
-
-# Copied from update_engine.te:
-# Note: fsetid checks are triggered when creating a file in a directory with
-# the setgid bit set to determine if the file should inherit setgid. In this
-# case, setgid on the file is undesirable so we should just suppress the
-# denial.
-dontaudit recovery self:global_capability_class_set fsetid;