Update Magisk Manager

Close #233

jni/Android.mk

@@ -52,13 +52,5 @@ include jni/external/Android.mk
 # libsepol, static library
 include jni/selinux/libsepol/Android.mk
 
-#####################################################################
-# In order to build separate binaries, please comment out everything 
-# above (including the lines for libraries)
-# Then, uncomment the line you want below
-#####################################################################
-# include jni/resetprop/Android.mk
-# include jni/magiskpolicy/Android.mk
-
 # Build magiskboot
 include jni/magiskboot/Android.mk

jni/daemon/bootstages.c

@@ -489,6 +489,7 @@ void post_fs_data(int client) {
 	debug_log_fd = xopen(DEBUG_LOG, O_WRONLY | O_CREAT | O_CLOEXEC | O_TRUNC, 0644);
 	char *const command[] = { "logcat", "-v", "brief", NULL };
 	debug_log_pid = run_command(0, &debug_log_fd, "/system/bin/logcat", command);
+	close(debug_log_fd);
 #endif
 
 	LOGI("** post-fs-data mode running\n");
@@ -556,7 +557,7 @@ void post_fs_data(int client) {
 
 	// Core only mode
 	if (access(DISABLEFILE, F_OK) == 0)
-		goto unblock;
+		goto core_only;
 
 	DIR *dir;
 	struct dirent *entry;
@@ -700,6 +701,7 @@ void post_fs_data(int client) {
 	LOGI("* Running module post-fs-data scripts\n");
 	exec_module_script("post-fs-data");
 
+core_only:
 	// Systemless hosts
 	if (access(HOSTSFILE, F_OK) == 0) {
 		LOGI("* Enabling systemless hosts file support");
@@ -775,6 +777,5 @@ void late_start(int client) {
 	// Stop recording the boot logcat after every boot task is done
 	kill(debug_log_pid, SIGTERM);
 	waitpid(debug_log_pid, NULL, 0);
-	close(debug_log_fd);
 #endif
 }

jni/daemon/log_monitor.c

@@ -31,7 +31,10 @@ static void *logger_thread(void *args) {
 		if (log_pid > 0)
 			waitpid(log_pid, NULL, 0);
 		// For some reason it went here, clear buffer and restart
-		system("logcat -c");
+		char *const restart[] = { "logcat", "-c", NULL };
+		log_pid = run_command(0, NULL, "/system/bin/logcat", restart);
+		if (log_pid > 0)
+			waitpid(log_pid, NULL, 0);
 	}
 
 	// Should never be here, but well...

jni/external/selinux_stub.c

@@ -1,5 +1,3 @@
-#include <sys/types.h>
-#include <stdarg.h>
 #include <stdbool.h>
 #include "selinux/avc.h"
 #include "selinux/context.h"

jni/external/sqlite3_stub.c

@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include "sqlite3.h"
 SQLITE_API const char *sqlite3_libversion(void) { return 0; }
 SQLITE_API const char *sqlite3_sourceid(void) { return 0; }

jni/magiskboot/Android.mk

@@ -12,10 +12,8 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_SRC_FILES := \
 	main.c \
-	unpack.c \
-	repack.c \
+	bootimg.c \
 	hexpatch.c \
-	parseimg.c \
 	compress.c \
 	boot_utils.c \
 	cpio.c \

jni/magiskboot/boot_utils.c

@@ -82,57 +82,8 @@ int open_new(const char *filename) {
 	return xopen(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
 }
 
-void print_info() {
-	printf("KERNEL [%d] @ 0x%08x\n", hdr.kernel_size, hdr.kernel_addr);
-	printf("RAMDISK [%d] @ 0x%08x\n", hdr.ramdisk_size, hdr.ramdisk_addr);
-	printf("SECOND [%d] @ 0x%08x\n", hdr.second_size, hdr.second_addr);
-	printf("DTB [%d] @ 0x%08x\n", hdr.dt_size, hdr.tags_addr);
-	printf("PAGESIZE [%d]\n", hdr.page_size);
-	if (hdr.os_version != 0) {
-		int a,b,c,y,m = 0;
-		int os_version, os_patch_level;
-		os_version = hdr.os_version >> 11;
-		os_patch_level = hdr.os_version & 0x7ff;
-		
-		a = (os_version >> 14) & 0x7f;
-		b = (os_version >> 7) & 0x7f;
-		c = os_version & 0x7f;
-		printf("OS_VERSION [%d.%d.%d]\n", a, b, c);
-		
-		y = (os_patch_level >> 4) + 2000;
-		m = os_patch_level & 0xf;
-		printf("PATCH_LEVEL [%d-%02d]\n", y, m);
-	}
-	printf("NAME [%s]\n", hdr.name);
-	printf("CMDLINE [%s]\n", hdr.cmdline);
-
-	switch (ramdisk_type) {
-		case GZIP:
-			printf("COMPRESSION [%s]\n", "gzip");
-			break;
-		case XZ:
-			printf("COMPRESSION [%s]\n", "xz");
-			break;
-		case LZMA:
-			printf("COMPRESSION [%s]\n", "lzma");
-			break;
-		case BZIP2:
-			printf("COMPRESSION [%s]\n", "bzip2");
-			break;
-		case LZ4:
-			printf("COMPRESSION [%s]\n", "lz4");
-			break;
-		case LZ4_LEGACY:
-			printf("COMPRESSION [%s]\n", "lz4_legacy");
-			break;
-		default:
-			fprintf(stderr, "Unknown ramdisk format!\n");
-	}
-	printf("\n");
-}
-
 void cleanup() {
-	printf("Cleaning up...\n");
+	fprintf(stderr, "Cleaning up...\n");
 	char name[PATH_MAX];
 	unlink(KERNEL_FILE);
 	unlink(RAMDISK_FILE);

jni/magiskboot/bootimg.c

@@ -0,0 +1,310 @@
+#include "bootimg.h"
+#include "magiskboot.h"
+
+static unsigned char *kernel, *ramdisk, *second, *dtb, *extra;
+static boot_img_hdr hdr;
+static int mtk_kernel = 0, mtk_ramdisk = 0;
+static file_t ramdisk_type;
+
+static void dump(unsigned char *buf, size_t size, const char *filename) {
+	int fd = open_new(filename);
+	xwrite(fd, buf, size);
+	close(fd);
+}
+
+static size_t restore(const char *filename, int fd) {
+	int ifd = xopen(filename, O_RDONLY);
+	size_t size = lseek(ifd, 0, SEEK_END);
+	lseek(ifd, 0, SEEK_SET);
+	xsendfile(fd, ifd, NULL, size);
+	close(ifd);
+	return size;
+}
+
+static void restore_buf(int fd, const void *buf, size_t size) {
+	xwrite(fd, buf, size);
+}
+
+static void print_info() {
+	fprintf(stderr, "KERNEL [%d] @ 0x%08x\n", hdr.kernel_size, hdr.kernel_addr);
+	fprintf(stderr, "RAMDISK [%d] @ 0x%08x\n", hdr.ramdisk_size, hdr.ramdisk_addr);
+	fprintf(stderr, "SECOND [%d] @ 0x%08x\n", hdr.second_size, hdr.second_addr);
+	fprintf(stderr, "DTB [%d] @ 0x%08x\n", hdr.dt_size, hdr.tags_addr);
+	fprintf(stderr, "PAGESIZE [%d]\n", hdr.page_size);
+	if (hdr.os_version != 0) {
+		int a,b,c,y,m = 0;
+		int os_version, os_patch_level;
+		os_version = hdr.os_version >> 11;
+		os_patch_level = hdr.os_version & 0x7ff;
+		
+		a = (os_version >> 14) & 0x7f;
+		b = (os_version >> 7) & 0x7f;
+		c = os_version & 0x7f;
+		fprintf(stderr, "OS_VERSION [%d.%d.%d]\n", a, b, c);
+		
+		y = (os_patch_level >> 4) + 2000;
+		m = os_patch_level & 0xf;
+		fprintf(stderr, "PATCH_LEVEL [%d-%02d]\n", y, m);
+	}
+	fprintf(stderr, "NAME [%s]\n", hdr.name);
+	fprintf(stderr, "CMDLINE [%s]\n", hdr.cmdline);
+
+	switch (ramdisk_type) {
+		case GZIP:
+			fprintf(stderr, "COMPRESSION [%s]\n", "gzip");
+			break;
+		case XZ:
+			fprintf(stderr, "COMPRESSION [%s]\n", "xz");
+			break;
+		case LZMA:
+			fprintf(stderr, "COMPRESSION [%s]\n", "lzma");
+			break;
+		case BZIP2:
+			fprintf(stderr, "COMPRESSION [%s]\n", "bzip2");
+			break;
+		case LZ4:
+			fprintf(stderr, "COMPRESSION [%s]\n", "lz4");
+			break;
+		case LZ4_LEGACY:
+			fprintf(stderr, "COMPRESSION [%s]\n", "lz4_legacy");
+			break;
+		default:
+			fprintf(stderr, "Unknown ramdisk format!\n");
+	}
+	fprintf(stderr, "\n");
+}
+
+int parse_img(unsigned char *orig, size_t size) {
+	unsigned char *base, *end;
+	size_t pos = 0;
+	int ret = 0;
+	for(base = orig, end = orig + size; base < end; base += 256, size -= 256) {
+		switch (check_type(base)) {
+		case CHROMEOS:
+			// The caller should know it's chromeos, as it needs additional signing
+			ret = 2;
+			continue;
+		case ELF32:
+			exit(3);
+		case ELF64:
+			exit(4);
+		case AOSP:
+			// Read the header
+			memcpy(&hdr, base, sizeof(hdr));
+			pos += hdr.page_size;
+
+			// Kernel position
+			kernel = base + pos;
+			pos += hdr.kernel_size;
+			mem_align(&pos, hdr.page_size);
+
+			// Ramdisk position
+			ramdisk = base + pos;
+			pos += hdr.ramdisk_size;
+			mem_align(&pos, hdr.page_size);
+
+			if (hdr.second_size) {
+				// Second position
+				second = base + pos;
+				pos += hdr.second_size;
+				mem_align(&pos, hdr.page_size);
+			}
+
+			if (hdr.dt_size) {
+				// dtb position
+				dtb = base + pos;
+				pos += hdr.dt_size;
+				mem_align(&pos, hdr.page_size);
+			}
+
+			if (pos < size) {
+				extra = base + pos;
+			}
+
+			// Check ramdisk compression type
+			ramdisk_type = check_type(ramdisk);
+
+			// Check MTK
+			if (check_type(kernel) == MTK) {
+				fprintf(stderr, "MTK header found in kernel\n");
+				mtk_kernel = 1;
+			}
+			if (ramdisk_type == MTK) {
+				fprintf(stderr, "MTK header found in ramdisk\n");
+				mtk_ramdisk = 1;
+				ramdisk_type = check_type(ramdisk + 512);
+			}
+
+			// Print info
+			print_info();
+			return ret;
+		default:
+			continue;
+		}
+	}
+	LOGE(1, "No boot image magic found!\n");
+}
+
+void unpack(const char* image) {
+	size_t size;
+	unsigned char *orig;
+	mmap_ro(image, &orig, &size);
+
+	// Parse image
+	fprintf(stderr, "Parsing boot image: [%s]\n\n", image);
+	int ret = parse_img(orig, size);
+
+	// Dump kernel
+	if (mtk_kernel) {
+		kernel += 512;
+		hdr.kernel_size -= 512;
+	}
+	dump(kernel, hdr.kernel_size, KERNEL_FILE);
+
+	// Dump ramdisk
+	if (mtk_ramdisk) {
+		ramdisk += 512;
+		hdr.ramdisk_size -= 512;
+	}
+	if (decomp(ramdisk_type, RAMDISK_FILE, ramdisk, hdr.ramdisk_size)) {
+		// Dump the compressed ramdisk
+		dump(ramdisk, hdr.ramdisk_size, RAMDISK_FILE ".unsupport");
+		LOGE(1, "Unsupported ramdisk format! Dumped to %s\n", RAMDISK_FILE ".unsupport");
+	}
+
+	if (hdr.second_size) {
+		// Dump second
+		dump(second, hdr.second_size, SECOND_FILE);
+	}
+
+	if (hdr.dt_size) {
+		// Dump dtb
+		dump(dtb, hdr.dt_size, DTB_FILE);
+	}
+
+	munmap(orig, size);
+	exit(ret);
+}
+
+void repack(const char* orig_image, const char* out_image) {
+	size_t size;
+	unsigned char *orig;
+	char name[PATH_MAX];
+
+	// There are possible two MTK headers
+	mtk_hdr mtk_kernel_hdr, mtk_ramdisk_hdr;
+	size_t mtk_kernel_off, mtk_ramdisk_off;
+
+	// Load original image
+	mmap_ro(orig_image, &orig, &size);
+
+	// Parse original image
+	fprintf(stderr, "Parsing boot image: [%s]\n\n", orig_image);
+	parse_img(orig, size);
+
+	fprintf(stderr, "Repack to boot image: [%s]\n\n", out_image);
+
+	// Create new image
+	int fd = open_new(out_image);
+
+	// Set all sizes to 0
+	hdr.kernel_size = 0;
+	hdr.ramdisk_size = 0;
+	hdr.second_size = 0;
+	hdr.dt_size = 0;
+
+	// Skip a page for header
+	write_zero(fd, hdr.page_size);
+
+	// Restore kernel
+	if (mtk_kernel) {
+		mtk_kernel_off = lseek(fd, 0, SEEK_CUR);
+		restore_buf(fd, kernel, 512);
+		memcpy(&mtk_kernel_hdr, kernel, sizeof(mtk_kernel_hdr));
+	}
+	hdr.kernel_size = restore(KERNEL_FILE, fd);
+	file_align(fd, hdr.page_size, 1);
+
+	// Restore ramdisk
+	if (mtk_ramdisk) {
+		mtk_ramdisk_off = lseek(fd, 0, SEEK_CUR);
+		restore_buf(fd, ramdisk, 512);
+		memcpy(&mtk_ramdisk_hdr, ramdisk, sizeof(mtk_ramdisk_hdr));
+	}
+	if (access(RAMDISK_FILE, R_OK) == 0) {
+		// If we found raw cpio, compress to original format
+
+		// Before we start, clean up previous compressed files
+		for (int i = 0; SUP_EXT_LIST[i]; ++i) {
+			sprintf(name, "%s.%s", RAMDISK_FILE, SUP_EXT_LIST[i]);
+			unlink(name);
+		}
+
+		size_t cpio_size;
+		unsigned char *cpio;
+		mmap_ro(RAMDISK_FILE, &cpio, &cpio_size);
+
+		if (comp(ramdisk_type, RAMDISK_FILE, cpio, cpio_size))
+			LOGE(1, "Unsupported ramdisk format!\n");
+
+		munmap(cpio, cpio_size);
+	}
+
+	int found = 0;
+	for (int i = 0; SUP_EXT_LIST[i]; ++i) {
+		sprintf(name, "%s.%s", RAMDISK_FILE, SUP_EXT_LIST[i]);
+		if (access(name, R_OK) == 0) {
+			ramdisk_type = SUP_TYPE_LIST[i];
+			found = 1;
+			break;
+		}
+	}
+	if (!found)
+		LOGE(1, "No ramdisk exists!\n");
+	hdr.ramdisk_size = restore(name, fd);
+	file_align(fd, hdr.page_size, 1);
+
+	// Restore second
+	if (access(SECOND_FILE, R_OK) == 0) {
+		hdr.second_size = restore(SECOND_FILE, fd);
+		file_align(fd, hdr.page_size, 1);
+	}
+
+	// Restore dtb
+	if (access(DTB_FILE, R_OK) == 0) {
+		hdr.dt_size = restore(DTB_FILE, fd);
+		file_align(fd, hdr.page_size, 1);
+	}
+
+	// Check extra info, currently only for LG Bump and Samsung SEANDROIDENFORCE
+	if (extra) {
+		if (memcmp(extra, "SEANDROIDENFORCE", 16) == 0 || 
+			memcmp(extra, "\x41\xa9\xe4\x67\x74\x4d\x1d\x1b\xa4\x29\xf2\xec\xea\x65\x52\x79", 16) == 0 ) {
+			restore_buf(fd, extra, 16);
+		}
+	}
+
+	// Write headers back
+	if (mtk_kernel) {
+		lseek(fd, mtk_kernel_off, SEEK_SET);
+		mtk_kernel_hdr.size = hdr.kernel_size;
+		hdr.kernel_size += 512;
+		restore_buf(fd, &mtk_kernel_hdr, sizeof(mtk_kernel_hdr));
+	}
+	if (mtk_ramdisk) {
+		lseek(fd, mtk_ramdisk_off, SEEK_SET);
+		mtk_ramdisk_hdr.size = hdr.ramdisk_size;
+		hdr.ramdisk_size += 512;
+		restore_buf(fd, &mtk_ramdisk_hdr, sizeof(mtk_ramdisk_hdr));
+	}
+	// Main header
+	lseek(fd, 0, SEEK_SET);
+	restore_buf(fd, &hdr, sizeof(hdr));
+
+	// Print new image info
+	print_info();
+
+	munmap(orig, size);
+	close(fd);
+}
+

jni/magiskboot/compress.c

@@ -22,10 +22,10 @@ static void write_file(const int fd, const void *buf, const size_t size, const c
 static void report(const int mode, const char* filename) {
 	switch(mode) {
 		case 0:
-			printf("Decompressing to [%s]\n\n", filename);
+			fprintf(stderr, "Decompressing to [%s]\n\n", filename);
 			break;
 		default:
-			printf("Compressing to [%s]\n\n", filename);
+			fprintf(stderr, "Compressing to [%s]\n\n", filename);
 			break;
 	}
 }
@@ -125,7 +125,7 @@ void lzma(int mode, const char* filename, const unsigned char* buf, size_t size)
 			ret = lzma_auto_decoder(&strm, UINT64_MAX, 0);
 			break;
 		case 1:
-			ret = lzma_stream_encoder(&strm, filters, LZMA_CHECK_CRC64);
+			ret = lzma_stream_encoder(&strm, filters, LZMA_CHECK_CRC32);
 			break;
 		case 2:
 			ret = lzma_alone_encoder(&strm, &opt);

jni/magiskboot/cpio.c

@@ -62,7 +62,7 @@ static int cpio_compare(const void *a, const void *b) {
 
 // Parse cpio file to a vector of cpio_file
 static void parse_cpio(const char *filename, struct vector *v) {
-	printf("Loading cpio: [%s]\n\n", filename);
+	fprintf(stderr, "Loading cpio: [%s]\n\n", filename);
 	int fd = xopen(filename, O_RDONLY);
 	cpio_newc_header header;
 	cpio_file *f;
@@ -105,7 +105,7 @@ static void parse_cpio(const char *filename, struct vector *v) {
 }
 
 static void dump_cpio(const char *filename, struct vector *v) {
-	printf("\nDump cpio: [%s]\n\n", filename);
+	fprintf(stderr, "\nDump cpio: [%s]\n\n", filename);
 	int fd = open_new(filename);
 	unsigned inode = 300000;
 	char header[111];
@@ -158,7 +158,7 @@ static void cpio_rm(int recursive, const char *entry, struct vector *v) {
 		if ((recursive && strncmp(f->filename, entry, strlen(entry)) == 0)
 			|| (strcmp(f->filename, entry) == 0) ) {
 			if (!f->remove) {
-				printf("Remove [%s]\n", entry);
+				fprintf(stderr, "Remove [%s]\n", entry);
 				f->remove = 1;
 			}
 			if (!recursive) return;
@@ -173,7 +173,7 @@ static void cpio_mkdir(mode_t mode, const char *entry, struct vector *v) {
 	f->filename = xmalloc(f->namesize);
 	memcpy(f->filename, entry, f->namesize);
 	cpio_vec_insert(v, f);
-	printf("Create directory [%s] (%04o)\n",entry, mode);
+	fprintf(stderr, "Create directory [%s] (%04o)\n",entry, mode);
 }
 
 static void cpio_add(mode_t mode, const char *entry, const char *filename, struct vector *v) {
@@ -189,7 +189,7 @@ static void cpio_add(mode_t mode, const char *entry, const char *filename, struc
 	xxread(fd, f->data, f->filesize);
 	close(fd);
 	cpio_vec_insert(v, f);
-	printf("Add entry [%s] (%04o)\n", entry, mode);
+	fprintf(stderr, "Add entry [%s] (%04o)\n", entry, mode);
 }
 
 static void cpio_test(struct vector *v) {
@@ -270,7 +270,7 @@ static void cpio_patch(struct vector *v, int keepverity, int keepforceencrypt) {
 					if (injected)
 						continue;
 					// Inject magisk script as import
-					printf("Inject new line [import /init.magisk.rc] in [init.rc]\n");
+					fprintf(stderr, "Inject new line [import /init.magisk.rc] in [init.rc]\n");
 					line = xcalloc(sizeof(*line), 1);
 					line->line = strdup("import /init.magisk.rc");
 					line->isNew = 1;
@@ -279,7 +279,7 @@ static void cpio_patch(struct vector *v, int keepverity, int keepforceencrypt) {
 					injected = 1;
 				} else if (strstr(line->line, "selinux.reload_policy")) {
 					// Remove this line
-					printf("Remove line [%s] in [init.rc]\n", line->line);
+					fprintf(stderr, "Remove line [%s] in [init.rc]\n", line->line);
 					f->filesize -= strlen(line->line) + 1;
 					__ = list_pop(&line->pos);
 					free(line);
@@ -296,14 +296,14 @@ static void cpio_patch(struct vector *v, int keepverity, int keepforceencrypt) {
 					for (read = 0, write = 0; read < f->filesize; ++read, ++write) {
 						skip = check_verity_pattern(f->data + read);
 						if (skip > 0) {
-							printf("Remove pattern [%.*s] in [%s]\n", skip, f->data + read, f->filename);
+							fprintf(stderr, "Remove pattern [%.*s] in [%s]\n", skip, f->data + read, f->filename);
 							read += skip;
 						}
 						f->data[write] = f->data[read];
 					}
 					f->filesize = write;
 				} else if (strcmp(f->filename, "verity_key") == 0) {
-					printf("Remove [verity_key]\n");
+					fprintf(stderr, "Remove [verity_key]\n");
 					f->remove = 1;
 				}
 			}
@@ -313,7 +313,7 @@ static void cpio_patch(struct vector *v, int keepverity, int keepforceencrypt) {
 						for (int i = 0 ; ENCRYPT_LIST[i]; ++i) {
 							if (strncmp(f->data + read, ENCRYPT_LIST[i], strlen(ENCRYPT_LIST[i])) == 0) {
 								memcpy(f->data + write, "encryptable", 11);
-								printf("Replace [%s] with [%s] in [%s]\n", ENCRYPT_LIST[i], "encryptable", f->filename);
+								fprintf(stderr, "Replace [%s] with [%s] in [%s]\n", ENCRYPT_LIST[i], "encryptable", f->filename);
 								write += 11;
 								read += strlen(ENCRYPT_LIST[i]);
 								break;
@@ -332,7 +332,7 @@ static void cpio_extract(const char *entry, const char *filename, struct vector
 	cpio_file *f;
 	vec_for_each(v, f) {
 		if (strcmp(f->filename, entry) == 0 && S_ISREG(f->mode)) {
-			printf("Extracting [%s] to [%s]\n\n", entry, filename);
+			fprintf(stderr, "Extracting [%s] to [%s]\n\n", entry, filename);
 			int fd = open_new(filename);
 			xwrite(fd, f->data, f->filesize);
 			fchmod(fd, f->mode);
@@ -390,14 +390,14 @@ static void cpio_backup(const char *orig, struct vector *v) {
 			// Something is missing in new ramdisk, backup!
 			++i;
 			doBak = 1;
-			printf("Backup missing entry: ");
+			fprintf(stderr, "Backup missing entry: ");
 		} else if (res == 0) {
 			++i; ++j;
 			if (m->filesize == n->filesize && memcmp(m->data, n->data, m->filesize) == 0)
 				continue;
 			// Not the same!
 			doBak = 1;
-			printf("Backup mismatch entry: ");
+			fprintf(stderr, "Backup mismatch entry: ");
 		} else {
 			// Someting new in ramdisk, record in rem
 			++j;
@@ -405,14 +405,14 @@ static void cpio_backup(const char *orig, struct vector *v) {
 			rem->data = xrealloc(rem->data, rem->filesize + n->namesize);
 			memcpy(rem->data + rem->filesize, n->filename, n->namesize);
 			rem->filesize += n->namesize;
-			printf("Record new entry: [%s] -> [.backup/.rmlist]\n", n->filename);
+			fprintf(stderr, "Record new entry: [%s] -> [.backup/.rmlist]\n", n->filename);
 		}
 		if (doBak) {
 			m->namesize += 8;
 			m->filename = realloc(m->filename, m->namesize);
 			strcpy(buf, m->filename);
 			sprintf(m->filename, ".backup/%s", buf);
-			printf("[%s] -> [%s]\n", buf, m->filename);
+			fprintf(stderr, "[%s] -> [%s]\n", buf, m->filename);
 			vec_push_back(&bak, m);
 			// NULL the original entry, so it won't be freed
 			vec_entry(o)[i - 1] = NULL;
@@ -459,7 +459,7 @@ static int cpio_restore(struct vector *v) {
 			n->data = xmalloc(n->filesize);
 			memcpy(n->data, f->data, n->filesize);
 			n->remove = 0;
-			printf("Restoring [%s] -> [%s]\n", f->filename, n->filename);
+			fprintf(stderr, "Restoring [%s] -> [%s]\n", f->filename, n->filename);
 			cpio_vec_insert(v, n);
 		}
 	}

jni/magiskboot/hexpatch.c

@@ -20,7 +20,7 @@ void hexpatch(const char *image, const char *from, const char *to) {
 	hex2byte(to, patch);
 	for (size_t i = 0; i < filesize - patternsize; ++i) {
 		if (memcmp(file + i, pattern, patternsize) == 0) {
-			printf("Pattern %s found!\nPatching to %s\n", from, to);
+			fprintf(stderr, "Pattern %s found!\nPatching to %s\n", from, to);
 			memset(file + i, 0, patternsize);
 			memcpy(file + i, patch, patchsize);
 			i += patternsize - 1;

jni/magiskboot/magiskboot.h

@@ -62,17 +62,11 @@ extern char *SUP_LIST[];
 extern char *SUP_EXT_LIST[];
 extern file_t SUP_TYPE_LIST[];
 
-// Global variables
-extern unsigned char *kernel, *ramdisk, *second, *dtb, *extra;
-extern boot_img_hdr hdr;
-extern file_t ramdisk_type;
-extern int mtk_kernel, mtk_ramdisk;
-
 // Main entries
 void unpack(const char *image);
 void repack(const char* orig_image, const char* out_image);
 void hexpatch(const char *image, const char *from, const char *to);
-void parse_img(unsigned char *orig, size_t size);
+int parse_img(unsigned char *orig, size_t size);
 int cpio_commands(const char *command, int argc, char *argv[]);
 void cleanup();
 
@@ -95,6 +89,5 @@ void write_zero(int fd, size_t size);
 void mem_align(size_t *pos, size_t align);
 void file_align(int fd, size_t align, int out);
 int open_new(const char *filename);
-void print_info();
 
 #endif

jni/magiskboot/main.c

@@ -58,7 +58,7 @@ static void usage(char *arg0) {
 }
 
 int main(int argc, char *argv[]) {
-	printf("MagiskBoot v" xstr(MAGISK_VERSION) "(" xstr(MAGISK_VER_CODE) ") (by topjohnwu) - Boot Image Modification Tool\n\n");
+	fprintf(stderr, "MagiskBoot v" xstr(MAGISK_VERSION) "(" xstr(MAGISK_VER_CODE) ") (by topjohnwu) - Boot Image Modification Tool\n\n");
 
 	if (argc > 1 && strcmp(argv[1], "--cleanup") == 0) {
 		cleanup();
@@ -68,8 +68,8 @@ int main(int argc, char *argv[]) {
 		mmap_ro(argv[2], (unsigned char **) &buf, &size);
 		SHA1(sha1, buf, size);
 		for (int i = 0; i < 20; ++i)
-			printf("%02x", sha1[i]);
-		printf("\n");
+			fprintf(stderr, "%02x", sha1[i]);
+		fprintf(stderr, "\n");
 		munmap(buf, size);
 	} else if (argc > 2 && strcmp(argv[1], "--unpack") == 0) {
 		unpack(argv[2]);

jni/magiskboot/parseimg.c

@@ -1,91 +0,0 @@
-#include "bootimg.h"
-#include "magiskboot.h"
-
-unsigned char *kernel, *ramdisk, *second, *dtb, *extra;
-boot_img_hdr hdr;
-int mtk_kernel = 0, mtk_ramdisk = 0;
-file_t ramdisk_type;
-
-static void check_headers() {
-	// Check ramdisk compression type
-	ramdisk_type = check_type(ramdisk);
-
-	// Check MTK
-	if (check_type(kernel) == MTK) {
-		printf("MTK header found in kernel\n");
-		mtk_kernel = 1;
-	}
-	if (ramdisk_type == MTK) {
-		printf("MTK header found in ramdisk\n");
-		mtk_ramdisk = 1;
-		ramdisk_type = check_type(ramdisk + 512);
-	}
-
-	// Print info
-	print_info();
-}
-
-static void parse_aosp(unsigned char *base, size_t size) {
-
-	// printf("IMG [AOSP]\n");
-
-	size_t pos = 0;
-
-	// Read the header
-	memcpy(&hdr, base, sizeof(hdr));
-	pos += hdr.page_size;
-
-	// Kernel position
-	kernel = base + pos;
-	pos += hdr.kernel_size;
-	mem_align(&pos, hdr.page_size);
-
-	// Ramdisk position
-	ramdisk = base + pos;
-	pos += hdr.ramdisk_size;
-	mem_align(&pos, hdr.page_size);
-
-	if (hdr.second_size) {
-		// Second position
-		second = base + pos;
-		pos += hdr.second_size;
-		mem_align(&pos, hdr.page_size);
-	}
-
-	if (hdr.dt_size) {
-		// dtb position
-		dtb = base + pos;
-		pos += hdr.dt_size;
-		mem_align(&pos, hdr.page_size);
-	}
-
-	if (pos < size) {
-		extra = base + pos;
-	}
-
-	check_headers();
-}
-
-void parse_img(unsigned char *orig, size_t size) {
-	unsigned char *base, *end;
-	for(base = orig, end = orig + size; base < end; base += 256, size -= 256) {
-		switch (check_type(base)) {
-		case CHROMEOS:
-			// The caller should know it's chromeos, as it needs additional signing
-			close(open_new("chromeos"));
-			continue;
-		case ELF32:
-			exit(2);
-			return;
-		case ELF64:
-			exit(3);
-			return;
-		case AOSP:
-			parse_aosp(base, size);
-			return;
-		default:
-			continue;
-		}
-	}
-	LOGE(1, "No boot image magic found!\n");
-}

jni/magiskboot/repack.c

@@ -1,136 +0,0 @@
-#include "magiskboot.h"
-
-static size_t restore(const char *filename, int fd) {
-	int ifd = xopen(filename, O_RDONLY);
-	size_t size = lseek(ifd, 0, SEEK_END);
-	lseek(ifd, 0, SEEK_SET);
-	xsendfile(fd, ifd, NULL, size);
-	close(ifd);
-	return size;
-}
-
-static void restore_buf(int fd, const void *buf, size_t size) {
-	xwrite(fd, buf, size);
-}
-
-void repack(const char* orig_image, const char* out_image) {
-	size_t size;
-	unsigned char *orig;
-	char name[PATH_MAX];
-
-	// There are possible two MTK headers
-	mtk_hdr mtk_kernel_hdr, mtk_ramdisk_hdr;
-	size_t mtk_kernel_off, mtk_ramdisk_off;
-
-	// Load original image
-	mmap_ro(orig_image, &orig, &size);
-
-	// Parse original image
-	printf("Parsing boot image: [%s]\n\n", orig_image);
-	parse_img(orig, size);
-
-	printf("Repack to boot image: [%s]\n\n", out_image);
-
-	// Create new image
-	int fd = open_new(out_image);
-
-	// Set all sizes to 0
-	hdr.kernel_size = 0;
-	hdr.ramdisk_size = 0;
-	hdr.second_size = 0;
-	hdr.dt_size = 0;
-
-	// Skip a page for header
-	write_zero(fd, hdr.page_size);
-
-	// Restore kernel
-	if (mtk_kernel) {
-		mtk_kernel_off = lseek(fd, 0, SEEK_CUR);
-		restore_buf(fd, kernel, 512);
-		memcpy(&mtk_kernel_hdr, kernel, sizeof(mtk_kernel_hdr));
-	}
-	hdr.kernel_size = restore(KERNEL_FILE, fd);
-	file_align(fd, hdr.page_size, 1);
-
-	// Restore ramdisk
-	if (mtk_ramdisk) {
-		mtk_ramdisk_off = lseek(fd, 0, SEEK_CUR);
-		restore_buf(fd, ramdisk, 512);
-		memcpy(&mtk_ramdisk_hdr, ramdisk, sizeof(mtk_ramdisk_hdr));
-	}
-	if (access(RAMDISK_FILE, R_OK) == 0) {
-		// If we found raw cpio, compress to original format
-
-		// Before we start, clean up previous compressed files
-		for (int i = 0; SUP_EXT_LIST[i]; ++i) {
-			sprintf(name, "%s.%s", RAMDISK_FILE, SUP_EXT_LIST[i]);
-			unlink(name);
-		}
-
-		size_t cpio_size;
-		unsigned char *cpio;
-		mmap_ro(RAMDISK_FILE, &cpio, &cpio_size);
-
-		if (comp(ramdisk_type, RAMDISK_FILE, cpio, cpio_size))
-			LOGE(1, "Unsupported ramdisk format!\n");
-
-		munmap(cpio, cpio_size);
-	}
-
-	int found = 0;
-	for (int i = 0; SUP_EXT_LIST[i]; ++i) {
-		sprintf(name, "%s.%s", RAMDISK_FILE, SUP_EXT_LIST[i]);
-		if (access(name, R_OK) == 0) {
-			ramdisk_type = SUP_TYPE_LIST[i];
-			found = 1;
-			break;
-		}
-	}
-	if (!found)
-		LOGE(1, "No ramdisk exists!\n");
-	hdr.ramdisk_size = restore(name, fd);
-	file_align(fd, hdr.page_size, 1);
-
-	// Restore second
-	if (access(SECOND_FILE, R_OK) == 0) {
-		hdr.second_size = restore(SECOND_FILE, fd);
-		file_align(fd, hdr.page_size, 1);
-	}
-
-	// Restore dtb
-	if (access(DTB_FILE, R_OK) == 0) {
-		hdr.dt_size = restore(DTB_FILE, fd);
-		file_align(fd, hdr.page_size, 1);
-	}
-
-	// Check extra info, currently only for LG Bump and Samsung SEANDROIDENFORCE
-	if (extra) {
-		if (memcmp(extra, "SEANDROIDENFORCE", 16) == 0 || 
-			memcmp(extra, "\x41\xa9\xe4\x67\x74\x4d\x1d\x1b\xa4\x29\xf2\xec\xea\x65\x52\x79", 16) == 0 ) {
-			restore_buf(fd, extra, 16);
-		}
-	}
-
-	// Write headers back
-	if (mtk_kernel) {
-		lseek(fd, mtk_kernel_off, SEEK_SET);
-		mtk_kernel_hdr.size = hdr.kernel_size;
-		hdr.kernel_size += 512;
-		restore_buf(fd, &mtk_kernel_hdr, sizeof(mtk_kernel_hdr));
-	}
-	if (mtk_ramdisk) {
-		lseek(fd, mtk_ramdisk_off, SEEK_SET);
-		mtk_ramdisk_hdr.size = hdr.ramdisk_size;
-		hdr.ramdisk_size += 512;
-		restore_buf(fd, &mtk_ramdisk_hdr, sizeof(mtk_ramdisk_hdr));
-	}
-	// Main header
-	lseek(fd, 0, SEEK_SET);
-	restore_buf(fd, &hdr, sizeof(hdr));
-
-	// Print new image info
-	print_info();
-
-	munmap(orig, size);
-	close(fd);
-}

jni/magiskboot/unpack.c

@@ -1,48 +0,0 @@
-#include "magiskboot.h"
-
-static void dump(unsigned char *buf, size_t size, const char *filename) {
-	int fd = open_new(filename);
-	xwrite(fd, buf, size);
-	close(fd);
-}
-
-void unpack(const char* image) {
-	size_t size;
-	unsigned char *orig;
-	mmap_ro(image, &orig, &size);
-
-	// Parse image
-	printf("Parsing boot image: [%s]\n\n", image);
-	parse_img(orig, size);
-
-	// Dump kernel
-	if (mtk_kernel) {
-		kernel += 512;
-		hdr.kernel_size -= 512;
-	}
-	dump(kernel, hdr.kernel_size, KERNEL_FILE);
-
-	// Dump ramdisk
-	if (mtk_ramdisk) {
-		ramdisk += 512;
-		hdr.ramdisk_size -= 512;
-	}
-	if (decomp(ramdisk_type, RAMDISK_FILE, ramdisk, hdr.ramdisk_size)) {
-		// Dump the compressed ramdisk
-		dump(ramdisk, hdr.ramdisk_size, RAMDISK_FILE ".unsupport");
-		LOGE(1, "Unsupported ramdisk format! Dumped to %s\n", RAMDISK_FILE ".unsupport");
-	}
-
-	if (hdr.second_size) {
-		// Dump second
-		dump(second, hdr.second_size, SECOND_FILE);
-	}
-
-	if (hdr.dt_size) {
-		// Dump dtb
-		dump(dtb, hdr.dt_size, DTB_FILE);
-	}
-
-	munmap(orig, size);
-}
-

jni/magiskhide/hide_utils.c

@@ -58,6 +58,17 @@ void hide_sensitive_props() {
 	}
 }
 
+static void rm_magisk_prop(const char *name) {
+	if (strstr(name, "magisk")) {
+		deleteprop(name, 0);
+	}
+}
+
+void clean_magisk_props() {
+	LOGD("hide_utils: Cleaning magisk props\n");
+	getprop_all(rm_magisk_prop);
+}
+
 void relink_sbin() {
 	struct stat st;
 	if (stat("/sbin_orig", &st) == -1 && errno == ENOENT) {
@@ -78,10 +89,14 @@ void relink_sbin() {
 		dir = xopendir("/sbin_orig");
 
 		while ((entry = xreaddir(dir))) {
-			snprintf(from, sizeof(from), "%s/%s", "/sbin_orig", entry->d_name);
-			snprintf(to, sizeof(to), "%s/%s", "/dev/sbin_bind", entry->d_name);
+			if (strcmp(entry->d_name, "..") == 0)
+				continue;
+			snprintf(from, sizeof(from), "/sbin_orig/%s", entry->d_name);
+			if (entry->d_type == DT_LNK)
+				xreadlink(from, from, sizeof(from));
+			snprintf(to, sizeof(to), "/dev/sbin_bind/%s", entry->d_name);
 			symlink(from, to);
-			lsetfilecon(to, "u:object_r:system_file:s0");
+			lsetfilecon(to, "u:object_r:rootfs:s0");
 		}
 		
 		closedir(dir);

jni/magiskhide/magiskhide.c

@@ -55,10 +55,7 @@ void launch_magiskhide(int client) {
 	hideEnabled = 1;
 	LOGI("* Starting MagiskHide\n");
 
-	if (client > 0) {
-		if (setprop(MAGISKHIDE_PROP, "1"))
-			goto error;
-	}
+	deleteprop(MAGISKHIDE_PROP, 1);
 
 	hide_sensitive_props();
 
@@ -104,6 +101,8 @@ void stop_magiskhide(int client) {
 
 	hideEnabled = 0;
 	setprop(MAGISKHIDE_PROP, "0");
+	// Remove without actually removing persist props
+	deleteprop(MAGISKHIDE_PROP, 0);
 	pthread_kill(proc_monitor_thread, SIGUSR1);
 
 	write_int(client, DAEMON_SUCCESS);

jni/magiskhide/magiskhide.h

@@ -13,6 +13,7 @@ void proc_monitor();
 void manage_selinux();
 void hide_sensitive_props();
 void relink_sbin();
+void clean_magisk_props();
 
 // List managements
 int add_list(char *proc);

jni/magiskhide/proc_monitor.c

@@ -91,6 +91,7 @@ static void hide_daemon(int pid) {
 
 	manage_selinux();
 	relink_sbin();
+	clean_magisk_props();
 
 	if (switch_mnt_ns(pid))
 		return;
@@ -180,7 +181,10 @@ void proc_monitor() {
 
 	while (1) {
 		// Clear previous logcat buffer
-		system("logcat -b events -c");
+		char *const restart[] = { "logcat", "-b", "events", "-c", NULL };
+		log_pid = run_command(0, NULL, "/system/bin/logcat", restart);
+		if (log_pid > 0)
+			waitpid(log_pid, NULL, 0);
 
 		// Monitor am_proc_start
 		char *const command[] = { "logcat", "-b", "events", "-v", "raw", "-s", "am_proc_start", NULL };
@@ -269,6 +273,5 @@ void proc_monitor() {
 		kill(log_pid, SIGTERM);
 		waitpid(log_pid, NULL, 0);
 		close(log_fd);
-		log_pid = 0;
 	}
 }

jni/resetprop/resetprop.cpp

@@ -60,43 +60,31 @@
 
 #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
 #include "_system_properties.h"
-#include <sys/system_properties.h>
-
-#ifdef INDEP_BINARY
-
-int resetprop_main(int argc, char *argv[]);
-int main(int argc, char *argv[]) {
-    return resetprop_main(argc, argv);
-}
-#define PRINT_D(...)  if (verbose) printf(__VA_ARGS__)
-#define PRINT_E(...)  fprintf(stderr, __VA_ARGS__)
-
-#else
+#include "system_properties.h"
 #include "magisk.h"
+#include "resetprop.h"
 
 #define PRINT_D(...)  { LOGD(__VA_ARGS__); if (verbose) printf(__VA_ARGS__); }
 #define PRINT_E(...)  { LOGE(__VA_ARGS__); fprintf(stderr, __VA_ARGS__); }
-
-#endif
-
-#include "resetprop.h"
+#define PERSISTENT_PROPERTY_DIR  "/data/property"
 
 static int verbose = 0;
 
-static bool is_legal_property_name(const char* name, size_t namelen) {
+static bool is_legal_property_name(const char *name, size_t namelen) {
+
     if (namelen < 1) return false;
     if (name[0] == '.') return false;
     if (name[namelen - 1] == '.') return false;
 
-    /* Only allow alphanumeric, plus '.', '-', or '_' */
+    /* Only allow alphanumeric, plus '.', '-', '@', ':', or '_' */
     /* Don't allow ".." to appear in a property name */
     for (size_t i = 0; i < namelen; i++) {
         if (name[i] == '.') {
             // i=0 is guaranteed to never have a dot. See above.
-            if (name[i - 1] == '.') return false;
+            if (name[i-1] == '.') return false;
             continue;
         }
-        if (name[i] == '_' || name[i] == '-') continue;
+        if (name[i] == '_' || name[i] == '-' || name[i] == '@' || name[i] == ':') continue;
         if (name[i] >= 'a' && name[i] <= 'z') continue;
         if (name[i] >= 'A' && name[i] <= 'Z') continue;
         if (name[i] >= '0' && name[i] <= '9') continue;
@@ -117,6 +105,7 @@ static int usage(char* arg0) {
         "Options:\n"
         "   -v          verbose output\n"
         "   -n          don't trigger events when changing props\n"
+        "               if used with deleteprop determines whether remove persist prop file\n"
     , arg0, arg0, arg0, arg0);
     return 1;
 }
@@ -152,6 +141,22 @@ char *getprop(const char *name) {
     return strdup(value);
 }
 
+static void (*cb)(const char *);
+
+static void run_actual_cb(void* cookie, const char *name, const char *value, uint32_t serial) {
+    cb(name);
+}
+
+static void prop_foreach_cb(const prop_info* pi, void* cookie) {
+    __system_property_read_callback2(pi, run_actual_cb, NULL);
+}
+
+void getprop_all(void (*cbk)(const char *name)) {
+    if (init_resetprop()) return;
+    cb = cbk;
+    __system_property_foreach2(prop_foreach_cb, NULL);
+}
+
 int setprop(const char *name, const char *value) {
     return setprop2(name, value, 1);
 }
@@ -163,7 +168,7 @@ int setprop2(const char *name, const char *value, const int trigger) {
     prop_info *pi = (prop_info*) __system_property_find2(name);
     if (pi != NULL) {
         if (trigger) {
-            if (!strncmp(name, "ro.", 3)) deleteprop(name);
+            if (!strncmp(name, "ro.", 3)) deleteprop(name, trigger);
             ret = __system_property_set2(name, value);
         } else {
             ret = __system_property_update2(pi, value, strlen(value));
@@ -186,13 +191,18 @@ int setprop2(const char *name, const char *value, const int trigger) {
     return ret;
 }
 
-int deleteprop(const char *name) {
+int deleteprop(const char *name, const int trigger) {
     if (init_resetprop()) return -1;
     PRINT_D("resetprop: deleteprop [%s]\n", name);
     if (__system_property_del(name)) {
-        PRINT_E("resetprop: delete prop: [%s] error\n", name);
+        PRINT_D("resetprop: delete prop: [%s] error\n", name);
         return -1;
     }
+    if (trigger && strstr(name, "persist.")) {
+        char buffer[PATH_MAX];
+        snprintf(buffer, sizeof(buffer), "%s/%s", PERSISTENT_PROPERTY_DIR, name);
+        unlink(buffer);
+    }
     return 0;
 }
 
@@ -287,7 +297,7 @@ int resetprop_main(int argc, char *argv[]) {
     if (file) {
         return read_prop_file(filename, trigger);
     } else if (del) {
-        return deleteprop(name);
+        return deleteprop(name, trigger);
     } else {
         return setprop2(name, value, trigger);
     }

jni/resetprop/resetprop.h

@@ -12,8 +12,9 @@ int prop_exist(const char *name);
 int setprop(const char *name, const char *value);
 int setprop2(const char *name, const char *value, const int trigger);
 char *getprop(const char *name);
-int deleteprop(const char *name);
+int deleteprop(const char *name, const int trigger);
 int read_prop_file(const char* filename, const int trigger);
+void getprop_all(void (*cbk)(const char *name));
 
 #ifdef __cplusplus
 }

jni/utils/misc.c

@@ -232,8 +232,6 @@ int run_command(int err, int *fd, const char *path, char *const argv[]) {
 			if (xpipe2(pipefd, O_CLOEXEC) == -1)
 				return -1;
 			writeEnd = pipefd[1];
-			// Give the read end of the pipe
-			*fd = pipefd[0];
 		} else {
 			writeEnd = *fd;
 		}
@@ -241,7 +239,11 @@ int run_command(int err, int *fd, const char *path, char *const argv[]) {
 
 	int pid = fork();
 	if (pid != 0) {
-		close(writeEnd);
+		if (fd && *fd < 0) {
+			// Give the read end and close write end
+			*fd = pipefd[0];
+			close(pipefd[1]);
+		}
 		return pid;
 	}
 

scripts/addon.d.sh

@@ -39,6 +39,9 @@ main() {
 
   api_level_arch_detect
 
+  # Check if system root is installed and remove
+  remove_system_su
+
   recovery_actions
 
   find_boot_image

scripts/boot_patch.sh

@@ -119,15 +119,19 @@ chmod +x ./*
 ui_print_wrap "- Unpacking boot image"
 ./magiskboot --unpack "$BOOTIMAGE"
 
+CHROMEOS=false
 case $? in
   1 )
     abort_wrap "! Unable to unpack boot image"
     ;;
   2 )
+    CHROMEOS=true
+    ;;
+  3 )
     ui_print_wrap "! Sony ELF32 format detected"
     abort_wrap "! Please use BootBridge from @AdrianDC to flash Magisk"
     ;;
-  3 )
+  4 )
     ui_print_wrap "! Sony ELF64 format detected"
     abort_wrap "! Stock kernel cannot be patched, please use a custom kernel"
 esac
@@ -234,7 +238,7 @@ ui_print_wrap "- Repacking boot image"
 ./magiskboot --repack "$BOOTIMAGE" || abort_wrap "! Unable to repack boot image!"
 
 # Sign chromeos boot
-if [ -f chromeos ]; then
+if $CHROMEOS; then
   echo > empty
 
   ./chromeos/futility vbutil_kernel --pack new-boot.img.signed \

scripts/flash_script.sh

@@ -66,14 +66,14 @@ getvar KEEPVERITY
 getvar KEEPFORCEENCRYPT
 getvar BOOTIMAGE
 
-# Check if system root is installed and remove
-remove_system_su
-
 # Detect version and architecture
 api_level_arch_detect
 
 [ $API -lt 21 ] && abort "! Magisk is only for Lollipop 5.0+ (SDK 21+)"
 
+# Check if system root is installed and remove
+remove_system_su
+
 ui_print "- Device platform: $ARCH"
 
 BINDIR=$INSTALLER/$ARCH

scripts/magisk_uninstaller.sh

@@ -65,7 +65,22 @@ cd $MAGISKBIN
 
 ui_print_wrap "- Unpacking boot image"
 ./magiskboot --unpack "$BOOTIMAGE"
-[ $? -ne 0 ] && abort_wrap "! Unable to unpack boot image"
+CHROMEOS=false
+case $? in
+  1 )
+    abort_wrap "! Unable to unpack boot image"
+    ;;
+  2 )
+    CHROMEOS=true
+    ;;
+  3 )
+    ui_print_wrap "! Sony ELF32 format detected"
+    abort_wrap "! Please use BootBridge from @AdrianDC to flash Magisk"
+    ;;
+  4 )
+    ui_print_wrap "! Sony ELF64 format detected"
+    abort_wrap "! Stock kernel cannot be patched, please use a custom kernel"
+esac
 
 # Update our previous backup to new format if exists
 if [ -f /data/stock_boot.img ]; then
@@ -109,11 +124,11 @@ case $? in
 esac
 
 # Sign chromeos boot
-if [ -f chromeos ]; then
+if $CHROMEOS; then
   echo > empty
 
-  LD_LIBRARY_PATH=$SYSTEMLIB $CHROMEDIR/futility vbutil_kernel --pack stock_boot.img.signed \
-  --keyblock $CHROMEDIR/kernel.keyblock --signprivate $CHROMEDIR/kernel_data_key.vbprivk \
+  ./chromeos/futility vbutil_kernel --pack stock_boot.img.signed \
+  --keyblock ./chromeos/kernel.keyblock --signprivate ./chromeos/kernel_data_key.vbprivk \
   --version 1 --vmlinuz stock_boot.img --config empty --arch arm --bootloader empty --flags 0x1
 
   rm -f empty stock_boot.img
@@ -132,6 +147,7 @@ ui_print_wrap "- Removing Magisk files"
 rm -rf  /cache/magisk.log /cache/last_magisk.log /cache/magiskhide.log /cache/.disable_magisk \
         /cache/magisk /cache/magisk_merge /cache/magisk_mount  /cache/unblock /cache/magisk_uninstaller.sh \
         /data/Magisk.apk /data/magisk.apk /data/magisk.img /data/magisk_merge.img /data/magisk_debug.log \
-        /data/busybox /data/magisk /data/custom_ramdisk_patch.sh 2>/dev/null
+        /data/busybox /data/magisk /data/custom_ramdisk_patch.sh /data/property/*magisk*
+        /data/app/com.topjohnwu.magisk* /data/user/*/com.topjohnwu.magisk 2>/dev/null
 
 $BOOTMODE && reboot