From 24cc2cdcae5542819e09963b0e1684e952adf9c7 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Thu, 30 Dec 2021 02:37:35 +0900 Subject: [PATCH] universal7885: fix drm widevine L3 * make directory for sec_efs partition * Address selinux denials while using it * HACK: Since oemcrypto looks for /factory/wv.keys, mount sec_efs partition on /factory instead of /efs Signed-off-by: roynatech2544 --- universal7885-common/BoardConfigCommon.mk | 2 ++ universal7885-common/rootdir/etc/init.exynos7885.rc | 2 +- universal7885-common/sepolicy/vendor/hal_drm_widevine.te | 3 +++ universal7885-common/sepolicy/vendor/iof_vendor.te | 4 ---- universal7885-common/sepolicy/vendor/proxy_daemon.te | 4 ---- universal7885-common/sepolicy/vendor/taadaemon.te | 4 ---- 6 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 universal7885-common/sepolicy/vendor/iof_vendor.te delete mode 100644 universal7885-common/sepolicy/vendor/proxy_daemon.te delete mode 100644 universal7885-common/sepolicy/vendor/taadaemon.te diff --git a/universal7885-common/BoardConfigCommon.mk b/universal7885-common/BoardConfigCommon.mk index f2c7d04..36975e7 100644 --- a/universal7885-common/BoardConfigCommon.mk +++ b/universal7885-common/BoardConfigCommon.mk @@ -83,6 +83,8 @@ TARGET_RELEASETOOLS_EXTENSIONS := $(COMMON_PATH)/releasetools # RIL ENABLE_VENDOR_RIL_SERVICE := true +TARGET_BOARD_ROOT_EXTRA_FOLDERS := factory + # Sepolicy SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += \ $(COMMON_PATH)/sepolicy/public diff --git a/universal7885-common/rootdir/etc/init.exynos7885.rc b/universal7885-common/rootdir/etc/init.exynos7885.rc index 5499b1e..789f33d 100644 --- a/universal7885-common/rootdir/etc/init.exynos7885.rc +++ b/universal7885-common/rootdir/etc/init.exynos7885.rc @@ -418,7 +418,7 @@ on fs mount_all /vendor/etc/fstab.${ro.hardware} --early # We need to seperate mounting SEC_EFS partition from fstab file due to GSI image loading case wait /dev/block/platform/13500000.dwmmc0/by-name/sec_efs - mount ext4 /dev/block/platform/13500000.dwmmc0/by-name/sec_efs /efs nosuid nodev noatime noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic + mount ext4 /dev/block/platform/13500000.dwmmc0/by-name/sec_efs /factory nosuid nodev noatime noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic mount none /mnt/vendor/cpefs /cpefs bind restorecon_recursive /mnt/vendor/efs diff --git a/universal7885-common/sepolicy/vendor/hal_drm_widevine.te b/universal7885-common/sepolicy/vendor/hal_drm_widevine.te index 21f377d..1404dd6 100644 --- a/universal7885-common/sepolicy/vendor/hal_drm_widevine.te +++ b/universal7885-common/sepolicy/vendor/hal_drm_widevine.te @@ -23,3 +23,6 @@ allow hal_drm_widevine efs_file:dir search; allow hal_drm_widevine drm_device:chr_file { read write open ioctl }; allow hal_drm_widevine tz_user_device:chr_file { read write open ioctl }; + +allow hal_drm_widevine sec_efs_file:file r_file_perms; + diff --git a/universal7885-common/sepolicy/vendor/iof_vendor.te b/universal7885-common/sepolicy/vendor/iof_vendor.te deleted file mode 100644 index 9b2921c..0000000 --- a/universal7885-common/sepolicy/vendor/iof_vendor.te +++ /dev/null @@ -1,4 +0,0 @@ -type iof_vendor, domain; -type iof_vendor_exec, file_type, vendor_file_type, exec_type; -init_daemon_domain(iof_vendor) - diff --git a/universal7885-common/sepolicy/vendor/proxy_daemon.te b/universal7885-common/sepolicy/vendor/proxy_daemon.te deleted file mode 100644 index 7614751..0000000 --- a/universal7885-common/sepolicy/vendor/proxy_daemon.te +++ /dev/null @@ -1,4 +0,0 @@ -type proxy_daemon, domain; -type proxy_daemon_exec, file_type, vendor_file_type, exec_type; -init_daemon_domain(proxy_daemon) - diff --git a/universal7885-common/sepolicy/vendor/taadaemon.te b/universal7885-common/sepolicy/vendor/taadaemon.te deleted file mode 100644 index 4852bfc..0000000 --- a/universal7885-common/sepolicy/vendor/taadaemon.te +++ /dev/null @@ -1,4 +0,0 @@ -type taadaemon, domain; -type taadaemon_exec, file_type, vendor_file_type, exec_type; -init_daemon_domain(taadaemon) -