br0kenpixel/ReZygisk
1
0
Fork 0
mirror of https://github.com/PerformanC/ReZygisk.git synced 2025-09-06 06:37:01 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: magisk file detection

Browse Source 
This commit fixes the detection for the "magisk" file which can be in 2 different folders, with 3 possible different names.
This commit is contained in:
ThePedroo
2024-12-12 20:10:38 -03:00
parent 060a1f3cf9
commit 8fb5d9197a
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
zygiskd/src/root_impl/magisk.c
View File

@@ -24,6 +24,7 @@ char *magisk_managers[] = {
}; };
#define SBIN_MAGISK lp_select("/sbin/magisk32", "/sbin/magisk64") #define SBIN_MAGISK lp_select("/sbin/magisk32", "/sbin/magisk64")
#define BITLESS_SBIN_MAGISK "/sbin/magisk"
#define DEBUG_RAMDISK_MAGISK lp_select("/debug_ramdisk/magisk32", "/debug_ramdisk/magisk64") #define DEBUG_RAMDISK_MAGISK lp_select("/debug_ramdisk/magisk32", "/debug_ramdisk/magisk64")
#define BITLESS_DEBUG_RAMDISK_MAGISK "/debug_ramdisk/magisk" #define BITLESS_DEBUG_RAMDISK_MAGISK "/debug_ramdisk/magisk"
@@ -39,31 +40,41 @@ void magisk_get_existence(struct root_impl_state *state) {
} }
errno = 0; errno = 0;
if (stat(DEBUG_RAMDISK_MAGISK, &s) != 0) { if (stat(BITLESS_SBIN_MAGISK, &s) != 0) {
if (errno != ENOENT) { if (errno != ENOENT) {
LOGE("Failed to stat Magisk %s binary: %s\n", DEBUG_RAMDISK_MAGISK, strerror(errno)); LOGE("Failed to stat Magisk %s binary: %s\n", BITLESS_SBIN_MAGISK, strerror(errno));
} }
errno = 0; errno = 0;
if (stat(BITLESS_DEBUG_RAMDISK_MAGISK, &s) != 0) { if (stat(DEBUG_RAMDISK_MAGISK, &s) != 0) {
if (errno != ENOENT) { if (errno != ENOENT) {
LOGE("Failed to stat Magisk /debug_ramdisk/magisk binary: %s\n", strerror(errno)); LOGE("Failed to stat Magisk %s binary: %s\n", DEBUG_RAMDISK_MAGISK, strerror(errno));
} }
errno = 0; errno = 0;
state->state = Inexistent; if (stat(BITLESS_DEBUG_RAMDISK_MAGISK, &s) != 0) {
if (errno != ENOENT) {
LOGE("Failed to stat Magisk /debug_ramdisk/magisk binary: %s\n", strerror(errno));
}
errno = 0;
return; state->state = Inexistent;
return;
}
/* INFO: /debug_ramdisk/magisk64 (or 32) doesn't exist but /debug_ramdisk/magisk does */
strcpy(path_to_magisk, BITLESS_DEBUG_RAMDISK_MAGISK);
} else {
/* INFO: /sbin/magisk doesn't exist but /debug_ramdisk/magisk does */
strcpy(path_to_magisk, DEBUG_RAMDISK_MAGISK);
} }
/* INFO: /debug_ramdisk/magisk64 (or 32) doesn't exist but /debug_ramdisk/magisk does */
strcpy(path_to_magisk, BITLESS_DEBUG_RAMDISK_MAGISK);
} else { } else {
/* INFO: /sbin/magisk doesn't exist but /debug_ramdisk/magisk does */ /* INFO: /sbin/magisk64 (or 32) doesn't exist but /sbin/magisk does */
strcpy(path_to_magisk, DEBUG_RAMDISK_MAGISK); strcpy(path_to_magisk, BITLESS_SBIN_MAGISK);
} }
} else { } else {
/* INFO: /sbin/magisk exists */ /* INFO: /sbin/magisk64 (or 32) exists */
strcpy(path_to_magisk, SBIN_MAGISK); strcpy(path_to_magisk, SBIN_MAGISK);
} }