Auto start magiskhide

jni/utils/misc.c

@@ -8,6 +8,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <pwd.h>
+#include <signal.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
@@ -15,6 +16,8 @@
 #include "magisk.h"
 #include "utils.h"
 
+int quit_signals[] = { SIGALRM, SIGABRT, SIGHUP, SIGPIPE, SIGQUIT, SIGTERM, SIGINT, 0 };
+
 unsigned get_shell_uid() {
 	struct passwd* ppwd = getpwnam("shell");
 	if (NULL == ppwd)
@@ -171,7 +174,7 @@ void unlock_blocks() {
 				continue;
 
 			if (ioctl(fd, BLKROSET, &OFF) == -1)
-				PLOGE("ioctl");
+				PLOGE("unlock %s", path);
 			close(fd);
 		}
 	}
@@ -183,3 +186,17 @@ void unblock_boot_process() {
 	int fd = open("/dev/.magisk.unblock", O_RDONLY | O_CREAT);
 	close(fd);
 }
+
+void setup_sighandlers(void (*handler)(int)) {
+	struct sigaction act;
+
+	// Install the termination handlers
+	// Note: we're assuming that none of these signal handlers are already trapped.
+	// If they are, we'll need to modify this code to save the previous handler and
+	// call it after we restore stdin to its previous state.
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = handler;
+	for (int i = 0; quit_signals[i]; ++i) {
+		sigaction(quit_signals[i], &act, NULL);
+	}
+}

jni/utils/utils.h

@@ -18,6 +18,8 @@
 #define UID_SYSTEM (get_system_uid())
 #define UID_RADIO  (get_radio_uid())
 
+extern int quit_signals[];
+
 // xwrap.c
 
 FILE *xfopen(const char *pathname, const char *mode);
@@ -42,12 +44,18 @@ void *xrealloc(void *ptr, size_t size);
 ssize_t xsendmsg(int sockfd, const struct msghdr *msg, int flags);
 ssize_t xrecvmsg(int sockfd, struct msghdr *msg, int flags);
 int xpthread_create(pthread_t *thread, const pthread_attr_t *attr,
-                          void *(*start_routine) (void *), void *arg);
+	void *(*start_routine) (void *), void *arg);
 int xsocketpair(int domain, int type, int protocol, int sv[2]);
 int xstat(const char *pathname, struct stat *buf);
 int xdup2(int oldfd, int newfd);
 ssize_t xreadlink(const char *pathname, char *buf, size_t bufsiz);
 int xsymlink(const char *target, const char *linkpath);
+int xmount(const char *source, const char *target,
+	const char *filesystemtype, unsigned long mountflags,
+	const void *data);
+int xchmod(const char *pathname, mode_t mode);
+int xrename(const char *oldpath, const char *newpath);
+int xmkdir(const char *pathname, mode_t mode);
 
 // misc.c
 
@@ -63,5 +71,6 @@ void ps_filter_proc_name(const char *filter, void (*func)(int));
 int create_links(const char *bin, const char *path);
 void unlock_blocks();
 void unblock_boot_process();
+void setup_sighandlers(void (*handler)(int));
 
 #endif

jni/utils/xwrap.c

@@ -17,6 +17,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/mount.h>
 #include <selinux/selinux.h>
 
 #include "magisk.h"
@@ -232,6 +233,7 @@ ssize_t xreadlink(const char *pathname, char *buf, size_t bufsiz) {
 		PLOGE("readlink %s", pathname);
 	} else {
 		buf[ret] = '\0';
+		++ret;
 	}
 	return ret;
 }
@@ -244,4 +246,38 @@ int xsymlink(const char *target, const char *linkpath) {
 	return ret;
 }
 
+int xmount(const char *source, const char *target,
+	const char *filesystemtype, unsigned long mountflags,
+	const void *data) {
+	int ret = mount(source, target, filesystemtype, mountflags, data);
+	if (ret == -1) {
+		PLOGE("mount %s->%s", source, target);
+	}
+	return ret;
+}
+
+int xchmod(const char *pathname, mode_t mode) {
+	int ret = chmod(pathname, mode);
+	if (ret == -1) {
+		PLOGE("chmod %s %u", pathname, mode);
+	}
+	return ret;
+}
+
+int xrename(const char *oldpath, const char *newpath) {
+	int ret = rename(oldpath, newpath);
+	if (ret == -1) {
+		PLOGE("rename %s->%s", oldpath, newpath);
+	}
+	return ret;
+}
+
+int xmkdir(const char *pathname, mode_t mode) {
+	int ret = mkdir(pathname, mode);
+	if (ret == -1) {
+		PLOGE("mkdir %s %u", pathname, mode);
+	}
+	return ret;
+}
+