file_contexts: Marking /dev/block/mmcblk0 as root_block_device

Changing the context of /dev/block/mmcblk0 from mmc_block_device
to root_block_device

Change-Id: Ia80ebc7ba58b9feadaf910fb83a19197d7eb2da8

11 files changed, 11 insertions, 14 deletions

diff --git a/apq8084/file_contexts b/apq8084/file_contexts
index 19361f79..ac2402e1 100644
--- a/apq8084/file_contexts
+++ b/apq8084/file_contexts
@@ -32,7 +32,7 @@
 /dev/block/platform/msm_sdcc\.1/by-name/ssd                             u:object_r:ssd_device:s0
 /dev/block/platform/msm_sdcc\.1/by-name/misc                            u:object_r:misc_partition:s0
 /dev/block/platform/msm_sdcc\.1/by-name/userdata                        u:object_r:userdata_block_device:s0
-/dev/block/mmcblk0                                                      u:object_r:mmc_block_device:s0
+/dev/block/mmcblk0                                                      u:object_r:root_block_device:s0
 /dev/block/mmcblk0rpmb                                                  u:object_r:rpmb_device:s0
 /dev/block/platform/msm_sdcc\.1/by-name/mdm1m9kefs1                     u:object_r:efs_boot_dev:s0
 /dev/block/platform/msm_sdcc\.1/by-name/mdm1m9kefs2                     u:object_r:efs_boot_dev:s0
diff --git a/common/device.te b/common/device.te
index 8f80031c..de87f73e 100644
--- a/common/device.te
+++ b/common/device.te
@@ -79,8 +79,6 @@ type ipa_dev, dev_type;
 
 type wcnss_device, dev_type;
 
-type mmc_block_device, dev_type;
-
 # Define QDSS devices
 type qdss_device, dev_type;
 
diff --git a/common/rmt_storage.te b/common/rmt_storage.te
index b0b7fb44..7647fec8 100644
--- a/common/rmt_storage.te
+++ b/common/rmt_storage.te
@@ -5,7 +5,7 @@ init_daemon_domain(rmt_storage)
 
 allow rmt_storage {
     modem_efs_partition_device
-    mmc_block_device
+    root_block_device
     ssd_device
 }:blk_file rw_file_perms;
 allow rmt_storage block_device:dir r_dir_perms;
@@ -31,4 +31,3 @@ wakelock_use(rmt_storage)
 
 allow rmt_storage self:socket create_socket_perms;
 allow rmt_storage uio_device:chr_file rw_file_perms;
-allow rmt_storage mmc_block_device:blk_file r_file_perms;
\ No newline at end of file
diff --git a/msm8226/file_contexts b/msm8226/file_contexts
index af71c04b..ae2c3a76 100644
--- a/msm8226/file_contexts
+++ b/msm8226/file_contexts
@@ -34,5 +34,5 @@
 /dev/block/platform/msm_sdcc\.1/by-name/ssd                   u:object_r:ssd_device:s0
 /dev/block/platform/msm_sdcc\.1/by-name/misc                  u:object_r:misc_partition:s0
 /dev/block/platform/msm_sdcc\.1/by-name/userdata              u:object_r:userdata_block_device:s0
-/dev/block/mmcblk0                                            u:object_r:mmc_block_device:s0
+/dev/block/mmcblk0                                            u:object_r:root_block_device:s0
 /dev/block/mmcblk0rpmb                                        u:object_r:rpmb_device:s0
diff --git a/msm8909/file_contexts b/msm8909/file_contexts
index c367ac88..071b83db 100644
--- a/msm8909/file_contexts
+++ b/msm8909/file_contexts
@@ -34,5 +34,5 @@
 /dev/block/platform/soc.0/7824900.sdhci/by-name/ssd                   u:object_r:ssd_device:s0
 /dev/block/platform/soc.0/7824900.sdhci/by-name/misc                  u:object_r:misc_partition:s0
 /dev/block/platform/soc.0/7824900.sdhci/by-name/userdata              u:object_r:userdata_block_device:s0
-/dev/block/mmcblk0                                                    u:object_r:mmc_block_device:s0
+/dev/block/mmcblk0                                                    u:object_r:root_block_device:s0
 /dev/block/mmcblk0rpmb                                                u:object_r:rpmb_device:s0
diff --git a/msm8916/file_contexts b/msm8916/file_contexts
index a15a0eb3..54b6ca7e 100644
--- a/msm8916/file_contexts
+++ b/msm8916/file_contexts
@@ -35,5 +35,5 @@
 /dev/block/platform/soc.0/7824900.sdhci/by-name/ssd                   u:object_r:ssd_device:s0
 /dev/block/platform/soc.0/7824900.sdhci/by-name/misc                  u:object_r:misc_partition:s0
 /dev/block/platform/soc.0/7824900.sdhci/by-name/userdata              u:object_r:userdata_block_device:s0
-/dev/block/mmcblk0                                                     u:object_r:mmc_block_device:s0
-/dev/block/mmcblk0rpmb                                                 u:object_r:rpmb_device:s0
+/dev/block/mmcblk0                                                    u:object_r:root_block_device:s0
+/dev/block/mmcblk0rpmb                                                u:object_r:rpmb_device:s0
diff --git a/msm8952/file_contexts b/msm8952/file_contexts
index 45abb70a..85ae2784 100644
--- a/msm8952/file_contexts
+++ b/msm8952/file_contexts
@@ -37,5 +37,5 @@
 /dev/block/platform/soc.0/7824900.sdhci/by-name/userdata              u:object_r:userdata_block_device:s0
 /dev/block/platform/soc.0/7824900.sdhci/by-name/dip                   u:object_r:dip_device:s0
 /dev/block/platform/soc.0/7824900.sdhci/by-name/mdtp                  u:object_r:mdtp_device:s0
-/dev/block/mmcblk0                                                    u:object_r:mmc_block_device:s0
+/dev/block/mmcblk0                                                    u:object_r:root_block_device:s0
 /dev/block/mmcblk0rpmb                                                u:object_r:rpmb_device:s0
diff --git a/msm8974/file_contexts b/msm8974/file_contexts
index bb71b7a8..7fbc7037 100644
--- a/msm8974/file_contexts
+++ b/msm8974/file_contexts
@@ -34,5 +34,5 @@
 /dev/block/platform/msm_sdcc\.1/by-name/ssd                   u:object_r:ssd_device:s0
 /dev/block/platform/msm_sdcc\.1/by-name/misc                  u:object_r:misc_partition:s0
 /dev/block/platform/msm_sdcc\.1/by-name/userdata              u:object_r:userdata_block_device:s0
-/dev/block/mmcblk0                                            u:object_r:mmc_block_device:s0
+/dev/block/mmcblk0                                            u:object_r:root_block_device:s0
 /dev/block/mmcblk0rpmb                                        u:object_r:rpmb_device:s0
diff --git a/msm8992/file_contexts b/msm8992/file_contexts
index 929070b3..c95ceb8d 100644
--- a/msm8992/file_contexts
+++ b/msm8992/file_contexts
@@ -35,4 +35,4 @@
 /dev/block/platform/soc.0/f9824900.sdhci/by-name/misc                               u:object_r:misc_partition:s0
 /dev/block/platform/soc.0/f9824900.sdhci/by-name/userdata                           u:object_r:userdata_block_device:s0
 /dev/block/mmcblk0rpmb                                                              u:object_r:rpmb_device:s0
-/dev/block/mmcblk0                                                                  u:object_r:mmc_block_device:s0
+/dev/block/mmcblk0                                                                  u:object_r:root_block_device:s0
diff --git a/msm8994/file_contexts b/msm8994/file_contexts
index 5e7a75c8..95e80fb2 100644
--- a/msm8994/file_contexts
+++ b/msm8994/file_contexts
@@ -29,7 +29,7 @@
 
 # common
 /dev/block/mmcblk0rpmb                                                              u:object_r:rpmb_device:s0
-/dev/block/mmcblk0                                                                  u:object_r:mmc_block_device:s0
+/dev/block/mmcblk0                                                                  u:object_r:root_block_device:s0
 
 # UFS devices
 /dev/block/platform/soc.0/fc594000.ufshc/by-name/fsc                                u:object_r:modem_efs_partition_device:s0
diff --git a/msm8996/file_contexts b/msm8996/file_contexts
index 2c43da5a..5b17f30d 100644
--- a/msm8996/file_contexts
+++ b/msm8996/file_contexts
@@ -29,7 +29,7 @@
 
 # common
 /dev/block/mmcblk0rpmb                                                          u:object_r:rpmb_device:s0
-/dev/block/mmcblk0                                                              u:object_r:mmc_block_device:s0
+/dev/block/mmcblk0                                                              u:object_r:root_block_device:s0
 
 # UFS devices
 /dev/block/platform/soc/624000.ufshc/by-name/fsc                                u:object_r:modem_efs_partition_device:s0