summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-07-27 03:04:58 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-07-27 03:04:58 +0000
commita5790e610f92012d659e80918c3519b15baf7b56 (patch)
tree03a84ec7b2e18ef284c8c412a6ef6538eb310301
parentce795d1585ffbb5c912054155cc560af7037e64c (diff)
parentc91dfe4f4ffe2a09b10b34f4698b9603da0d1c26 (diff)
Snap for 4916303 from c91dfe4f4ffe2a09b10b34f4698b9603da0d1c26 to pi-qpr1-release
Change-Id: Iecab3230d57601b2a77480a30d3a040c8c04152e
-rw-r--r--vendor/google/fsck.te2
-rw-r--r--vendor/qcom/common/device.te3
-rw-r--r--vendor/qcom/common/rfs_access.te2
-rw-r--r--vendor/qcom/common/ueventd.te1
-rw-r--r--vendor/qcom/sdm845/file_contexts1
5 files changed, 8 insertions, 1 deletions
diff --git a/vendor/google/fsck.te b/vendor/google/fsck.te
new file mode 100644
index 0000000..9c64f10
--- /dev/null
+++ b/vendor/google/fsck.te
@@ -0,0 +1,2 @@
+allow fsck persist_block_device:blk_file rw_file_perms;
+
diff --git a/vendor/qcom/common/device.te b/vendor/qcom/common/device.te
index 8b92ebf..b20c09c 100644
--- a/vendor/qcom/common/device.te
+++ b/vendor/qcom/common/device.te
@@ -5,14 +5,15 @@ type bt_device, dev_type;
type diag_device, dev_type, mlstrustedobject;
type dsp_device, dev_type;
type easel_device, dev_type, mlstrustedobject;
+type gpt_block_device, dev_type;
type ipa_dev, dev_type;
type latency_device, dev_type;
type modem_block_device, dev_type;
+type persist_block_device, dev_type;
type qsee_ipc_irq_spss_device, dev_type;
type qdsp_device, dev_type, mlstrustedobject;
type ramdump_device, dev_type;
type rmnet_device, dev_type;
-type gpt_block_device, dev_type;
type ramdump_block_device, dev_type;
type seemplog_device, dev_type;
type sg_device, dev_type;
diff --git a/vendor/qcom/common/rfs_access.te b/vendor/qcom/common/rfs_access.te
index be7e18d..280ab02 100644
--- a/vendor/qcom/common/rfs_access.te
+++ b/vendor/qcom/common/rfs_access.te
@@ -8,6 +8,8 @@ allow rfs_access self:capability { chown setgid setpcap setuid net_bind_service
wakelock_use(rfs_access)
+r_dir_file(rfs_access, firmware_file);
+
# For tftp server file access
allow rfs_access mnt_vendor_file:dir search;
allow rfs_access mnt_vendor_file:file r_file_perms;
diff --git a/vendor/qcom/common/ueventd.te b/vendor/qcom/common/ueventd.te
index e7799ab..f0a175d 100644
--- a/vendor/qcom/common/ueventd.te
+++ b/vendor/qcom/common/ueventd.te
@@ -12,6 +12,7 @@ allow ueventd sysfs_net:file w_file_perms;
allow ueventd sysfs_msm_subsys:file w_file_perms;
allow ueventd sysfs_bluetooth_writable:file w_file_perms;
allow ueventd sysfs_usb_c:file w_file_perms;
+allow ueventd firmware_file:lnk_file read;
allow ueventd firmware_file:dir search;
allow ueventd firmware_file:file r_file_perms;
allow ueventd tmpfs:blk_file getattr;
diff --git a/vendor/qcom/sdm845/file_contexts b/vendor/qcom/sdm845/file_contexts
index ee215e5..4603b8d 100644
--- a/vendor/qcom/sdm845/file_contexts
+++ b/vendor/qcom/sdm845/file_contexts
@@ -27,6 +27,7 @@
/dev/block/platform/soc/1d84000\.ufshc/by-name/modem_[ab] u:object_r:modem_block_device:s0
/dev/block/platform/soc/1d84000\.ufshc/by-name/modemst[12] u:object_r:modem_block_device:s0
/dev/block/platform/soc/1d84000\.ufshc/by-name/ssd u:object_r:ssd_block_device:s0
+/dev/block/platform/soc/1d84000\.ufshc/by-name/persist u:object_r:persist_block_device:s0
/dev/block/platform/soc/1d84000\.ufshc/by-name/product_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000\.ufshc/by-name/system_[ab] u:object_r:system_block_device:s0
/dev/block/platform/soc/1d84000\.ufshc/by-name/vendor_[ab] u:object_r:system_block_device:s0