From e112b2fb59a7332de00887e9e8c65352dbf50fa7 Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Fri, 11 Feb 2022 19:03:37 +0900
Subject: [PATCH] universal7885: debug_daemon: Move to /system

* Vendor processes can no longer execute system processes...
---
 universal7885-common/debug/Android.bp                     | 1 -
 universal7885-common/debug/init.debug_daemon.rc           | 2 +-
 .../sepolicy/{vendor => private}/debug_daemon.te          | 8 ++++----
 universal7885-common/sepolicy/private/file_contexts       | 4 ++++
 universal7885-common/sepolicy/vendor/file_contexts        | 3 ---
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename universal7885-common/sepolicy/{vendor => private}/debug_daemon.te (69%)

diff --git a/universal7885-common/debug/Android.bp b/universal7885-common/debug/Android.bp
index 8725c96..56fe276 100644
--- a/universal7885-common/debug/Android.bp
+++ b/universal7885-common/debug/Android.bp
@@ -16,7 +16,6 @@
 
 cc_binary {
     name: "debug_daemon",
-    vendor: true,
     srcs: [
          "Logger.cpp",
     ],
diff --git a/universal7885-common/debug/init.debug_daemon.rc b/universal7885-common/debug/init.debug_daemon.rc
index 8faf66f..bccb1d1 100644
--- a/universal7885-common/debug/init.debug_daemon.rc
+++ b/universal7885-common/debug/init.debug_daemon.rc
@@ -1,4 +1,4 @@
-service debug_daemon /vendor/bin/debug_daemon
+service debug_daemon /system/bin/debug_daemon
     user root
     group system
     oneshot
diff --git a/universal7885-common/sepolicy/vendor/debug_daemon.te b/universal7885-common/sepolicy/private/debug_daemon.te
similarity index 69%
rename from universal7885-common/sepolicy/vendor/debug_daemon.te
rename to universal7885-common/sepolicy/private/debug_daemon.te
index d6c6cee..9d9bc7a 100644
--- a/universal7885-common/sepolicy/vendor/debug_daemon.te
+++ b/universal7885-common/sepolicy/private/debug_daemon.te
@@ -1,7 +1,7 @@
-type debug_daemon, domain, vendor_executes_system_violators;
-type debug_daemon_exec, exec_type, file_type, vendor_file_type;
+type debug_daemon, domain, coredomain;
+type debug_daemon_exec, exec_type, file_type, system_file_type;
 init_daemon_domain(debug_daemon)
-type debug_daemon_data_file, file_type, data_file_type;
+type debug_daemon_data_file, file_type, data_file_type, core_data_file_type;
 
 allow debug_daemon debug_daemon_data_file:dir rw_dir_perms;
 allow debug_daemon debug_daemon_data_file:file rw_file_perms;
@@ -10,7 +10,7 @@ allow debug_daemon logcat_exec:file rx_file_perms;
 allow debug_daemon self:capability2 syslog;
 allow debug_daemon kernel:system syslog_mod;
 allow debug_daemon debug_daemon_data_file:file create_file_perms;
-allow debug_daemon vendor_shell_exec:file execute_no_trans;
+allow debug_daemon shell_exec:file execute_no_trans;
 allow debug_daemon self:capability sys_nice;
 allow debug_daemon logdr_socket:sock_file write;
 allow debug_daemon logd:unix_stream_socket connectto;
diff --git a/universal7885-common/sepolicy/private/file_contexts b/universal7885-common/sepolicy/private/file_contexts
index d0618ad..1082552 100644
--- a/universal7885-common/sepolicy/private/file_contexts
+++ b/universal7885-common/sepolicy/private/file_contexts
@@ -2,3 +2,7 @@
 
 ### DATA
 /data/zram(/.*)?                             u:object_r:zram_data_file:s0
+
+# DEBUG DAEMON
+/system/bin/debug_daemon 					u:object_r:debug_daemon_exec:s0
+/data/debug(/.*)?   					u:object_r:debug_daemon_data_file:s0
diff --git a/universal7885-common/sepolicy/vendor/file_contexts b/universal7885-common/sepolicy/vendor/file_contexts
index f4f92cd..90b6162 100644
--- a/universal7885-common/sepolicy/vendor/file_contexts
+++ b/universal7885-common/sepolicy/vendor/file_contexts
@@ -139,9 +139,6 @@
 /(vendor|system/vendor)/bin/hw/android\.hardware\.light(@[0-9].[0-9])?-service\.samsung              u:object_r:hal_light_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.thermal@[0-9].[0-9]-service\.samsung            u:object_r:hal_thermal_default_exec:s0
 
-# DEBUG DAEMON
-/(vendor|system/vendor)/bin/debug_daemon 		u:object_r:debug_daemon_exec:s0
-/data/debug(/.*)?   					u:object_r:debug_daemon_data_file:s0
 ####################################
 # Devices
 /dev/mali[0-9]*                                             u:object_r:gpu_device:s0