Merge tag 'LA.UM.6.6.r1-06700-89xx.0' of https://source.codeaurora.org/quic/la/device/qcom/sepolicy into HEAD

"LA.UM.6.6.r1-06700-89xx.0"

Change-Id: I43cd6b355e62d352f3fe4a4bd989e073d85709ff

3 files changed, 0 insertions, 37 deletions

diff --git a/sdm660/file.te b/sdm660/file.te
index 71310e13..814b29a4 100644
--- a/sdm660/file.te
+++ b/sdm660/file.te
@@ -25,7 +25,5 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#sysfs emmc dload type
-type sysfs_emmc_dload, sysfs_type, fs_type;
 #sysfs rndis usb type
 type sysfs_rndis_usb, sysfs_type, fs_type;
diff --git a/sdm660/file_contexts b/sdm660/file_contexts
index a4f10f53..dec0949d 100644
--- a/sdm660/file_contexts
+++ b/sdm660/file_contexts
@@ -146,8 +146,6 @@
 
 ##################################
 # rawdump partition
-/sys/kernel/dload/emmc_dload                                                    u:object_r:sysfs_emmc_dload:s0
-/sys/kernel/dload/dload_mode                                                    u:object_r:sysfs_emmc_dload:s0
 
 #EMMC
 /dev/block/platform/soc/c0c4000.sdhci/by-name/rawdump                           u:object_r:rawdump_block_device:s0
diff --git a/sdm660/qti-logkit.te b/sdm660/qti-logkit.te
deleted file mode 100644
index af328f52..00000000
--- a/sdm660/qti-logkit.te
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2017, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# allow qti_logkit for rawdump partition
-allow qti_logkit block_device:dir r_dir_perms;
-allow qti_logkit rawdump_block_device:blk_file rw_file_perms;
-
-# allow qti_logkit for sysfs emmc dload node
-allow qti_logkit sysfs_emmc_dload:file rw_file_perms;