From b9cdc755d19010cbbdc146083ad1738f1cdc1cf5 Mon Sep 17 00:00:00 2001
From: Shaka Huang <shakalaca@gmail.com>
Date: Sat, 13 Mar 2021 01:47:13 +0800
Subject: [PATCH] Returned fds[0] in socketpair() might be STDOUT

* There will be garbage output when executing `su` (#4016)
* Failed to check root status and showing N/A in status (#4005)

Signed-off-by: Shaka Huang <shakalaca@gmail.com>
---
 native/jni/core/daemon.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/native/jni/core/daemon.cpp b/native/jni/core/daemon.cpp
index bf9b87955..bbc5b665e 100644
--- a/native/jni/core/daemon.cpp
+++ b/native/jni/core/daemon.cpp
@@ -172,8 +172,6 @@ static int switch_cgroup(const char *cgroup, int pid) {
     // Change process name
     set_nice_name("magiskd");
 
-    magisk_logging();
-
     int fd = xopen("/dev/null", O_WRONLY);
     xdup2(fd, STDOUT_FILENO);
     xdup2(fd, STDERR_FILENO);
@@ -184,6 +182,8 @@ static int switch_cgroup(const char *cgroup, int pid) {
     if (fd > STDERR_FILENO)
         close(fd);
 
+    magisk_logging();
+
     setsid();
     setcon("u:r:" SEPOL_PROC_DOMAIN ":s0");